Merge origin/master

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

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

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

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