Many changes - Sgard je t'emmerde
Sgard je t'emmerde
Merge branch 'master' of https://github.com/FLEDevgit/AngApp.git

Conflicts:
	AngularApp/public/controller/authent.js
	AngularApp/public/login.html