pls
Merge branch 'marc' into Sami
Managing the daily shit
Merge branch 'Sami' into marc

Conflicts:
	app/Controller/IndexController.js