fix analytics
remove contrib-imagemin
update directory structure
Merge branch 'master' into with_bourbon

Conflicts:
	app/sass/_test.scss
	app/sass/_test2.scss
	app/sass/test.scss
	app/sass/test2.scss
	sass/test.scss
	sass/test2.scss