合并
Signed-off-by: An <lasdtc@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/Action/BlogAction.class
	WebRoot/WEB-INF/classes/com/ISharing/Action/UserAction.class

Signed-off-by: An <lasdtc@gmail.com>