merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml