Fixing failing tests. Adding trips/maps_controller tests
Test updates
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'master' into tests
Tests for admin/photos#destroy
Merge branch 'tests' into quick-changes

Conflicts:
	app/controllers/photos_controller.rb
Fixing failing PhotosController tests