Themes et competences
Merge remote-tracking branch 'origin/update' into master_merging_branch

Conflicts:
	mongoosepm/public/views/user_form.html