changes to bower.json and package.json
Merge branch 'master' of github.com:goldibex/boilerplate