Updated changelog and tools

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