page login, activation de angularJs
Merge branch 'pagesUser' into develop

Conflicts:
	nbproject/project.properties