.
Merge branch 'develop'

Conflicts:
	web-server/src/app.ls
	web-server/src/controllers/home_controller.ls
	web-server/src/helper/views.ls