Updated tools and roomservice.xml

	modified:   tools/merge.sh
	modified:   tools/push.sh
	modified:   tools/roomservice.xml