into develop Conflicts: htdocs/contact/class/contact.class.php test/phpunit/ContactTest.php test/phpunit/SocieteTest.php