Fix modal covering header with janky javascript
Merge branch 'master' into bootstrap-sass-3

Conflicts:
	app/assets/stylesheets/application.css.scss