split
Merge branch 'master' of https://github.com/ei12003/sdis1

Conflicts:
	sdis/src/sdis/SubscribeChannel.java
splitmessage
commit
commit