Merge origin/master

Conflicts:
	web/META-INF/context.xml