oops
Merge branch 'master' into kevin

Conflicts:
	app/views/admin/reports/calendar.html.erb
	app/views/admin/reports/permission.html.erb
	app/views/admin/reports/shift_switch.html.erb
shift email. should be good
more super generic copy!
Merge branch 'kevin'