2014-9-23 linyb 用户
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/go/base/constant/Go_ControllerConstant.java
	src/com/go/sys/controller/authority/Go_UserController.java