add icons, add mobile meta tags
Merge branch 'master' of github.com:mwaylabs/generator-tmp2

* 'master' of github.com:mwaylabs/generator-tmp2:
  add icons, add mobile meta tags

Conflicts:
	app/templates/Gruntfile.js