Merge origin/master

Conflicts:
	web/blog.jsp
Merge origin/master

Conflicts:
	web/blog.jsp
Merge origin/master

Conflicts:
	web/blog.jsp
Merge origin/master

Conflicts:
	web/blog.jsp
Merge origin/master

Conflicts:
	web/blog.jsp
bah
Merge origin/master