Merge branch 'develop'
fix bower.json and package.json
edit README
fix README
Merge branch 'master' into gh-pages