1
Merge branch 'master' of https://github.com/arliangtw/Blog

Conflicts:
	web/index_v1.jsp
Merge branch 'master' of https://github.com/arliangtw/Blog

Conflicts:
	web/index_v1.jsp