Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Simplification de la fonction
déplacé dans Recaptcha
version
.
Merge branch 'master' of https://github.com/dontspamagain/laravel

Conflicts:
	app/views/pages/contact.blade.php
.