dfg
Merge branch 'master' of git@github.com:getnut/MyBlog.git

Conflicts:
	WebRoot/WEB-INF/urlrewrite.xml
	WebRoot/dp/main.jsp
工作呀！
Merge branch 'dev_2'

Conflicts:
	WebRoot/dp/main.jsp