Merge branch 'master' into reduce_logs

Author: cesine

package.json

@@ -40,7 +40,7 @@
     "debug": "^2.6.3",
     "express": "^4.13.3",
     "express-session": "^1.11.3",
-    "fielddb": "5.121.19-rc0",
+    "fielddb": "^5.168.13-rc0",
     "forever": "^0.15.1",
     "handlebars": "^4.0.2",
     "history": "^1.17.0",
@@ -77,7 +77,7 @@
     "lint:es6": "eslint --fix --ext .jsx --ext .js app bin",
     "start": "./bin/fielddb-web-server",
     "start:watch": "NODE_PATH=./app concurrently --kill-others \"nodemon ./bin/fielddb-web-server\" \"node webpack.server.js\" \"gulp css:watch\"",
-    "start:production": "NODE_ENV=production PORT=8000 API_BASE_URL=http://localhost:8000 NODE_PATH=./app node app/server",
+    "start:production": "NODE_ENV=production PORT=8000 API_BASE_URL=http://localhost:8000 NODE_PATH=./app node bin/fielddb-web-server",
     "test": "NODE_ENV=test mocha test/**/*-spec.js",
     "test:ci": "NODE_ENV=test NODE_PATH=./app mocha --compilers js:babel-register -r app/spec/support/setup.mocha.js --recursive 'app/**/*.test.js'",
     "test:site": "node test/integration/links.js",

public/components/fielddb/fielddb.js

@@ -73995,7 +73995,7 @@ function extend() {
 },{}],317:[function(require,module,exports){
 module.exports={
   "name": "fielddb",
-  "version": "5.121.19-rc0",
+  "version": "5.168.13-rc0",
   "description": "An offline/online field database which adapts to its user's terminology and I-Language",
   "homepage": "https://github.com/FieldDB/FieldDB/issues/milestones?state=closed",
   "repository": {
@@ -74072,7 +74072,7 @@ module.exports={
     "build:angular-client": "bash scripts/build_fielddb_angular_core.sh || echo 'this client is deprecated and might not build much longer'",
     "build:backbone-client": "bash scripts/build_fielddb_minified.sh",
     "build:min": "echo TODO",
-    "build:ci": "npm run lint && npm run test:jasmineAllTestsErrorWorkaround && npm test && npm run build && npm run build:min && npm run docs && npm run build:angular-client && npm run build:backbone-client",
+    "build:ci": "npm run lint && npm run test:jasmineAllTestsErrorWorkaround && npm test && npm run build && npm run build:min && npm run docs  && npm run build:backbone-client",
     "optionalPostinstall": "bower link || exit 0"
   },
   "license": "Apache-2.0"

yarn.lock

@@ -2304,10 +2304,10 @@ fbjs@^0.8.4, fbjs@^0.8.9:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
-fielddb@5.121.19-rc0:
-  version "5.121.19-rc0"
-  resolved "https://registry.yarnpkg.com/fielddb/-/fielddb-5.121.19-rc0.tgz#b9cddb3dbd8eafb16c63f85f06cd605f2bc3198c"
-  integrity sha512-14kciRrjmRICFdoHBq3Ws8x2N/uaogA+l2h94lDQ+7xd3y9lE2WIl/EhWhCCz8+bNIVHIcAiiyuxb5KxX05m5g==
+fielddb@^5.168.13-rc0:
+  version "5.168.13-rc0"
+  resolved "https://registry.yarnpkg.com/fielddb/-/fielddb-5.168.13-rc0.tgz#c0f9b3b25f1d9c4726b6807803541eeace48cc4f"
+  integrity sha512-EaJS7gHzIU8//QJ/q1IVLbHsrRt7TcoyObGAjJINBrnpZSoJcTXX4L7UlDies0h4y8pTsHG52zgpnxK/M3aBxQ==
   dependencies:
     atob "^2.1.2"
     bcryptjs "^2.4.3"