Merge origin/master

Conflicts:
	web/WEB-INF/web.xml
Merge origin/master