Commit Nico
Merge branch 'master' of https://github.com/abaticle/app_commande

Conflicts:
	app_commande.zip
	view/Report/Main.controller.js