Merge branch 'jphernandez'
contact form ready on frech
Merge branch 'origin/master'

Conflicts:
	www/nous-joindre.php
Merge branch 'master'