update README.md
update bower.json
Merge branch 'develop'