Merge origin/master

Conflicts:
	SOLSA/web/WEB-INF/web.xml