Merge branch 'development' into issue/296

package.json

@@ -25,7 +25,6 @@
     "debug": "~2.3.x",
     "dirty-chai": "^1.2.2",
     "express": "^4.13.0",
-    "faker": "^3.1.0",
     "forever": "^0.15.2",
     "js2xmlparser": "^2.0.2",
     "jwt-simple": "^0.5.0",