bower.json changes
Merge branch 'develop'