Installation de FosUserBundle
suppression Bundle acme demo
Merge branch 'develop' of https://github.com/nass59/BDMania into develop
Merge branch 'master' into develop
page login, activation de angularJs
Merge branch 'pagesUser' into develop

Conflicts:
	nbproject/project.properties