Ajout des flags
Merge branch 'master' of https://github.com/thomasrm/tp2

Conflicts:
	application/Front/views/scripts/test/take.phtml
Merge branch 'master' of https://github.com/thomasrm/tp2