Merge origin/master

Conflicts:
	New Folder/WAMP_blog_engine/src/main/webapp/WEB-INF/views/layout/navigation.jsp