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

Conflicts:
	WebContent/WEB-INF/pages/entity.jsp