New stuff
New stuff
Merge origin/master

Conflicts:
	src/java/struts.xml
	web/blog/viewBlog.jsp
Merge origin/master
Merge origin/master

Conflicts:
	src/java/struts.xml
	web/blog/viewBlog.jsp