OR
Merge branch 'develop' of https://github.com/patrickdr/itcmanilaO149jg31O into develop-pat
baked collections
added collection
todo : print trips
ppm txt file
Merge branch 'develop' of https://github.com/patrickdr/itcmanilaO149jg31O into develop-pat
todo : generating excel file for trips
generate PPM report
Merge branch 'develop' of https://github.com/patrickdr/itcmanilaO149jg31O into develop-pat

Conflicts:
	app/Controller/ReportsController.php
Resolved ReportsController.php
view for ppm reports
Merge branch 'develop' of https://github.com/patrickdr/itcmanilaO149jg31O into develop-gellie

Conflicts:
	app/Controller/ReportsController.php