commit admin
Merge branch 'master' of https://github.com/karlchan-cn/Blog.git

Conflicts:
	src/main/webapp/WEB-INF/pages/adminIndex.jsp