refactor
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/net/github/rtc/micro/user/dao/UserDao.java
Merge remote-tracking branch 'origin/develop' into develop