debugged CollabStringTest
Merge branch 'master' of https://github.com/mkrause/gx

Conflicts:
	src/gx/realtime/CollaborativeString.java
Merge branch 'master' of https://github.com/mkrause/gx