Commit Gatien - recup ppe5
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/vues/v_dashtech.php
Commit Gatien - recup ppe5