update
Merge branch 'master' of ssh://git@github.com/quenti77/AMAC.git

Conflicts:
	src/esgi/amac/plugins/contacts/ContactView.java
	www/index.php
	www/modules/user/services/login.php
	www/modules/user/services/subscrib.php
	www/res/js/component/form.js
	www/res/js/view/signup.js