Merge branch 'development' into db_simcaq_dev2

src/libs/middlewares/query.js

src/libs/routes/simulation.js

src/test/query.js

src/test/simulation.js