Repaired
Merge branch 'repair'

Conflicts:
	app/assets/javascripts/application.js
	public/assets/application-3878aec4a025d73b544ce5f6ae4f5710.js.gz