Competence et Themes

Formulaires foncionnel
Merge remote-tracking branch 'origin/update' into update

Conflicts:
	mongoosepm/public/controllers/layout_controller.js
	mongoosepm/public/controllers/user_form_controller.js
Commit Captcha