v 0.0.92 with file sync
Merge branch 'master' of https://github.com/mborkowski/generator-yeomagento

Conflicts:
	app/templates/_bower.json
	app/templates/_gruntfile.js
	package.json