Fix grunt build and add packages in bower.json
Merge branch 'fix-grunt-build'