Signed-off-by: zyh <yuanh@ccabot.com>
Merge branch 'master' of https://github.com/ebspos/ebspos

Conflicts:
	webroot/WEB-INF/classes/sql.xml

Signed-off-by: zyh <yuanh@ccabot.com>