Merge origin/master

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

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

This reverts commit 8e789ef1eb883aa1b7305b3008fe95d2a818bfa6.
Merge origin/master