Added basic reporting functionality and started to create role-based auth for admin functions
Merge branch 'develop' of github.com:camsys/oneclick into develop

Conflicts:
	app/models/trip.rb