Update server1.xml
Merge branch 'master' into developCHange1

Conflicts:
	server1.xml