aaa
Merge branch 'master' of https://github.com/handsomeTom/mblog

Conflicts:
	src/mblog/action/FindUserByNickAction.java
	src/struts.xml
Merge branch 'master' of https://github.com/handsomeTom/mblog

Conflicts:
	src/applicationContext.xml
	src/mblog/service/impl/MblogServiceImpl.java
	src/struts.xml