Merge branch 'carrier'

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/_form.html.erb
	app/views/events/index.html.erb
	app/views/events/index.json.jbuilder
	app/views/events/show.html.erb
	app/views/events/show.json.jbuilder
	config/routes.rb
	test/controllers/events_controller_test.rb
changed photo index view to show thumbnails
Merge branch 'master' of github.com:sebarmano/wedding

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