一点小修改
Merge branch 'master' of https://github.com/jenseni/ezsp

Conflicts:
	doc/database.sql