my stuff
Merge remote-tracking branch 'upstream/master'

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