Merge branch 'profile_edit'

Merge branch 'profile_edit'

Conflicts:

	htdocs/css/default.css
	htdocs/css/keynote.css
	htdocs/css/openweb.css
	include/platal.inc.php
	modules/profile/assign_adresses.inc.php
	modules/profile/assign_poly.inc.php
	modules/profile/get_adresses.inc.php
	modules/profile/get_deco.inc.php
	modules/profile/get_general.inc.php
	modules/profile/get_mentor.inc.php
	modules/profile/update_adresses.inc.php
	modules/profile/verif_adresses.inc.php
	modules/profile/verif_general.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>