Signed-off-by: ZhongLing <kevin6132919@163.com>
Merge branch 'master' of git@github.com:zhengjiabin/ISharing.git
WriteArticleAction分离

Signed-off-by: ZhongLing <kevin6132919@163.com>
Merge branch 'master' of git@github.com:zhengjiabin/ISharing.git

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/Action/UserAction.class
	src/com/ISharing/Action/UserAction.java
冲突改动
Signed-off-by: ZhongLing <kevin6132919@163.com>