Merge origin/develop into develop

Conflicts:
	web/WEB-INF/web.xml