.
Merge branch 'develop'

Conflicts:
	api-server/src/app.js
	api-server/src/app.ls
	api-server/src/controllers/home_controller.js
	api-server/src/controllers/home_controller.ls
	web-server/lib/helper/views.js
	web-server/src/helper/views.js
	web-server/src/helpers/logger.js
	web-server/src/helpers/logger.ls
	web-server/src/helpers/views.js
.