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

Conflicts:
	src/net/ion/message/push/sender/PusherConfig.java