change bower.json
Merge branch 'change_bower_json'