解决冲突
Merge branch 'develop' of https://github.com/shenghaishiweini/CCContact into develop

Conflicts:
	WebRoot/WEB-INF/classes/com/sys/action/ContactorAction.class
	WebRoot/WEB-INF/classes/com/sys/action/GroupAction.class
	WebRoot/WEB-INF/classes/com/sys/action/LoginAction.class
	WebRoot/WEB-INF/classes/com/sys/action/ShortMsgAction.class
	WebRoot/WEB-INF/classes/com/sys/dao/Impl/CommonMethodImpl.class
	WebRoot/WEB-INF/classes/com/sys/dao/Impl/ContactorDaoImpl.class
	WebRoot/WEB-INF/classes/com/sys/dao/Impl/GroupDaoImpl.class
	WebRoot/WEB-INF/classes/com/sys/dao/Impl/ShortMsgDaoImpl.class
	WebRoot/WEB-INF/classes/com/sys/dao/Impl/UserDaoImpl.class
	WebRoot/WEB-INF/classes/com/sys/dao/Interface/IContactorDao.class
	WebRoot/WEB-INF/classes/com/sys/dao/Interface/IGroupDao.class
	WebRoot/WEB-INF/classes/com/sys/dao/Interface/IUserDao.class
	WebRoot/WEB-INF/classes/com/sys/utils/Constants.class
	WebRoot/WEB-INF/classes/com/sys/utils/TimeUtils.class