Merge branch 'master' into eventbrite-api

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/home/index.html.erb