Update app/index.js
Merge branch 'master' of https://github.com/lukaszgrolik/generator-front into dev

Conflicts:
	app/index.js
Merge branch 'master' into dev
Update app/index.js
Update sass-main.scss template
Update app/index.js
Rename template files to reflect folder structure
Update expected files in test-creation.js
Merge branch 'dev'
0.2.2