Installing angular
Merge branch 'marc' into Sami

Conflicts:
	app/Controller/IndexController.js
Merge branch 'Sami' into marc