Grunt and bower assets
Merge branch 'master' of github.com:Stasmo/vivo-engine