Merge branch 'master' into ember_conversion

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb