update
Merge branch 'gh-pages' of
https://zhenglianfu@github.com/zhenglianfu/foo.git into gh-pages

Conflicts:
	static/js/modules/simp/modules/event.js