1. script update
Merge branch 'master' of https://github.com/bleujin/talkserver

Conflicts:
	test/net/ion/talk/deploy/TestToonServerNew.java