test
Merge branch 'master' of https://github.com/bobmeek/MyBlog_2014-12-04

Conflicts:
	WebRoot/WEB-INF/config/springmvc-servlet.xml
	WebRoot/view/user/register.jsp