bye bye entete
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/controleurs/c_dashboard_club.php
bye bye header mobile