modify
Merge branch 'master' of https://github.com/TimGuan/blog

Conflicts:
	tim.blog.api/src/main/resources/blog-persistence.xml
	tim.blog.api/src/main/resources/blog-servlet.xml
	tim.blog.api/src/main/webapp/static_resources/js/demo.js