test class
class rub
Merge remote-tracking branch 'origin/rub-dev'
del
del
places
placete
heures
Merge remote-tracking branch 'origin/rub-dev'
Merge remote-tracking branch 'origin/mik-dev'

Conflicts:
	Theseus/app/model/Evenement.php
correction test