modified:   src/applicationContext.xml
	modified:   src/applicationContext.xml
Merge branch 'master' of https://github.com/golfdev/Gf-core
Merge branch 'master' of https://github.com/golfdev/Gf-core
Merge branch 'master' of https://github.com/golfdev/Gf-core
	modified:   src/com/jinfang/golf/constants/GolfConstant.java
	modified:   src/com/jinfang/golf/db/GolfDataSource.java
	modified:   src/com/jinfang/golf/db/GolfDataSourceFactory.java
	new file:   src/com/jinfang/golf/group/dao/GroupDAO.java
	new file:   src/com/jinfang/golf/group/dao/GroupUserDAO.java
	new file:   src/com/jinfang/golf/group/dao/UserGroupDAO.java
	new file:   src/com/jinfang/golf/group/home/GroupHome.java
	new file:   src/com/jinfang/golf/group/home/GroupUserHome.java
	new file:   src/com/jinfang/golf/group/home/UserGroupHome.java
	new file:   src/com/jinfang/golf/group/manager/GroupManager.java
	new file:   src/com/jinfang/golf/group/model/Group.java
	new file:   src/com/jinfang/golf/group/model/UserGroup.java
	modified:   src/com/jinfang/golf/user/home/UserHome.java
	new file:   src/com/jinfang/golf/utils/IdSeqUtils.java
	deleted:    src/com/jinfang/golf/xmpp/group/GroupChatManager.java
	new file:   src/com/jinfang/golf/xmpp/model/Audio.java
	new file:   src/com/jinfang/golf/xmpp/model/Photo.java
	new file:   src/db_script.txt
	modified:   src/server.properties