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

Conflicts:
	src/com/util/DateUtil.java

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

Conflicts:
	sql/ebspos_20131008byXt.sql

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