update bower.json
Merge branch 'work'