config change
Merge remote-tracking branch 'origin/master'

Conflicts:
	betsys-core/src/main/webapp/WEB-INF/remoting-servlet.xml