update
Merge branch 'master' of https://github.com/hekexue/stewardship

Conflicts:
	public/index.html
update codes