commit some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/web.xml