Signed-off-by: CCJoy <ccwang.joy@gmail.com>
Merge branch 'master' of https://github.com/handsomeTom/mblog.git

Conflicts:
	WebRoot/scripts/mblog.js
	WebRoot/search_userlist.jsp
	src/mblog/action/FindUserByNickAction.java

Signed-off-by: CCJoy <ccwang.joy@gmail.com>
Signed-off-by: CCJoy <ccwang.joy@gmail.com>