le fb qui marche pas
Merge remote-tracking branch 'origin/work-in-progres' into work-in-progres

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/signCtrl.js