Added bower.json
erge branch 'master' of github.com:Islive-io/bridge
resolved conflict