Merge origin/master

Conflicts:
	New Folder/WAMP_blog_engine/src/main/webapp/WEB-INF/WAMPBlogger-servlet.xml
	New Folder/WAMP_blog_engine/src/main/webapp/WEB-INF/springconfig.xml
	New Folder/WAMP_blog_engine/src/main/webapp/index.html
Merge origin/master