fix .npmignore and bower ignore
fix docs layout
Merge branch 'master' into gh-pages

* master:
  fix docs layout
  fix .npmignore and bower ignore