Update bower.json
Merge branch 'master' into parallax