修改bower.json
Merge remote-tracking branch 'tgfex/master'