DBy
Merge branch 'master' of github.com:TEOUltimus/TopicConnect

Conflicts:
	Platform.java