nwei, fix some issue of create.sql
Merge branch 'master' of https://github.com/xingbo/dps

Conflicts:
	src/main/scripts/db/create.sql