bower.json fix (#254)
Merge branch 'master' into develop