Merge origin/master

Conflicts:
	src/main/webapp/index.jsp
Merge origin/master