alignement mac
Merge branch 'master' of https://github.com/Quentou/QmarkProject

Conflicts:
	Qmark/target-eclipse/classes/BootStrap$_closure1.class
	Qmark/target-eclipse/classes/loginproject/UserController.class
#6 mise en place de la persistance