commit ne pas récuperer
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/controleurs/c_dashboard_club.php
	mobile/controleurs/c_dashboard_tech.php
	mobile/vues/v_new_bug.php
commit v_delete