Fixed sprinkle scss
Merge branch 'master' of github.com:mondora/mnd-website

Conflicts:
	app/pages/channel/edit/channelEdit.html