modify doc
modify doc
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	examples/index.html
new doc
new doc
Merge branch 'master' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'master' into gh-pages
new doc
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
doc
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge branch 'master' into gh-pages