Bug修改
Merge branch 'kik' of https://github.com/ejustech/iron into kik

Conflicts:
	src/com/ejustech/iron/common/ConstantSql.java