Merge branch 'development' into simobject_20160927

CHANGELOG.md

gulpfile.babel.js

src/libs/app.js

src/libs/middlewares/parseParams.js

src/libs/middlewares/query.js

src/libs/routes/enrollment.js

src/test/test.js