import of base.sass in custom.sass
Merge branch 'master' into demo

Conflicts:
	app/styles/sass/custom/main.sass
main.sass fixed after mergring from master