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

Conflicts:
	WebRoot/App/friendsMap.jsp

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