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

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/META-INF/MANIFEST.MF
	WebRoot/WEB-INF/web.xml
	WebRoot/dp/main.jsp
	WebRoot/index.jsp
	WebRoot/resource/scripts/jquery-1.8.3.js
	WebRoot/resource/scripts/jquery.validate.min.js
	WebRoot/resource/scripts/login.js
	WebRoot/resource/styles/default.css
	WebRoot/resource/styles/login.css
	src/com/blog/controller/BlogController.java
	src/com/blog/controller/UserController.java
	src/com/blog/dao/impl/PageDaoImpl.java
	src/com/test/JsonTest.java