modified:   src/com/jinfang/golf/constants/GolfConstant.java
modified:   src/com/jinfang/golf/group/dao/GroupDAO.java
	modified:   src/com/jinfang/golf/xmpp/model/Audio.java
Merge branch 'master' of https://github.com/golfdev/Gf-core

Conflicts:
	src/server.properties

	modified:   src/com/jinfang/golf/db/GolfDataSource.java
	modified:   src/com/jinfang/golf/db/GolfDataSourceFactory.java
	modified:   src/com/jinfang/golf/user/dao/UserCentifyDAO.java