correctif template.php  + correctif templates
Merge branch 'master' of github.com:Arthur447/experts

Conflicts:
	sites/all/themes/theme_experts/templates/user/user-profile--full.tpl.php