Merge branch 'master' of https://github.com/allen4z/Gogo.git

Conflicts:
	src/com/gogo/dao/UserAndRoleDao.java
	src/com/gogo/service/ActivityService.java
111
Merge remote-tracking branch 'origin/master'