增加了两种颜色demo
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages

Conflicts:
	demo/index.html
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
Merge branch 'dev' into gh-pages
增加统计代码。
Merge branch 'dev' into gh-pages
去除百度统计底部的logo
增加一个禁用捕捉window报错的方法。
Merge branch 'dev'

Conflicts:
	demo.html
	demo/index.html