Merge pull request #1 from tonifisler/master

update from forking source
Merge remote-tracking branch 'upstream/master'
Add image managemet #22
Merge branch 'master' of github.com:antistatique/generator-styleguide into antistatique-master

Conflicts:
	app/templates/gulpfile.js