started reimpl collisions
updated kryo to 2.24 and fixed couple of cosmetic bugs
ugly poc hack for server persistence impl
Merge branch 'develop' of git://github.com/orlof/megastage into gradle_eclipse

Conflicts:
	nbproject/project.properties