Change all times to hours, with 15 min precision
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/app/views/requests/admin_index.html.erb
	code/app/views/requests/index.html.erb