WIP, DON'T PUSH
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4

Conflicts:
	app/views/locations/show.html.erb
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4

Conflicts:
	app/views/locations/show.html.erb