Test de form
Merge github.com:Cliko/projet-AngularJS

Conflicts:
	app/views/main.html