Add one time activities
Merge branch 'master' into activities
Ugh. Make the api accept camelCase
Ugh. The one camelCased class.

Putting this in until we can refactor Museum.rb
Admin form for activities
Add activities to museum edit and cleanup
Can't add actvities on new museum form
add authentication to admin pages
clean up activity format
Goodness me.
Merge branch 'master' into activities

Conflicts:
	Gemfile.lock
	app/controllers/museums_controller.rb
	app/models/museum.rb
	app/views/museums/_form.html.erb
	app/views/museums/index.html.erb
	app/views/museums/index.json.jbuilder
	app/views/museums/show.json.jbuilder
	spec/models/museum_spec.rb
remove exception for admin auth
Snake case museum now
Merge branch 'master' into activities

Conflicts:
	angular/app/views/museumDetail.html
	app/controllers/museums_controller.rb
	app/views/museums/show.json.jbuilder
Merge pull request #5 from CoolCulture/activities

Activities
Update old camelCase imageUrl
Don't minify images
separate admin out to a separate path, like it should be
Merge branch 'master' into add-admin-auth

Conflicts:
	app/controllers/museums_controller.rb
	app/views/admin/museums/index.html.erb
	app/views/admin/museums/show.html.erb
	config/routes.rb
	spec/controllers/admin/family_cards_controller_spec.rb
	spec/controllers/admin/museums_controller_spec.rb
	spec/controllers/checkins_controller_spec.rb
	spec/spec_helper.rb
Move checkin create to api routes