all demo things removed
gitattributes modified
Merge branch 'master' into demo

Conflicts:
	.gitattributes
	app/styles/sass/custom/_1382.sass
	app/styles/sass/custom/_480.sass
	app/styles/sass/custom/_992.sass
	app/styles/sass/custom/_fonts.sass
	app/styles/sass/custom/_mixins.sass
	app/styles/sass/custom/_page.sass
	app/styles/sass/custom/_reset.sass
	app/styles/sass/custom/_variables.sass
	app/styles/sass/custom/main.sass
demo data files
demo styles added again
whoru-icons fonts path fixed (relative again)
Merge branch 'master' into demo