init
init charroi
Import kringloop
draft de l'ajout d'un enlèvement
Gestion enlèvement
Merge branch 'dev' into charroi
Gestion kringloop
Gestion des catégories kringloop
Gestion des catégories kringloop
Merge branch 'dev' into charroi
Merge branch 'dev' into charroi
Merge branch 'dev' into charroi
Merge branch 'dev' into charroi
Gestion tournée
Merge branch 'dev' into charroi
Gestion tournée
Merge branch 'dev' into charroi
Gestion des tournées
Merge branch 'dev' into charroi
Merge branch 'dev' into charroi

Conflicts:
	MainApplication/public/stylesheets/app.less
Merge branch 'dev' into charroi

Conflicts:
	MainApplication/app/jobs/MaintenanceJob.java