quick fix for edit report button
add edit report button for calendar reports
clean up code
Merge branch 'edit-report-btn' of github.com:Orasi/blue-source into staging

Conflicts:
	app/views/calendar/report.html.erb