Revert "Merge branch 'master'"

This reverts commit c7df6813cf80492f15a6136017257b622530663e.

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