report generation WIP
Merge branch 'master' into report_data

Conflicts:
	app/controllers/reports_controller.rb