modal magic
loading spinner
Merge branch 'dev-sass'

Conflicts:
	default.hbs