Kleinere Änderungen
nbt_test gemerched

Signed-off-by: John Kapri <john.kapri@gmx.net>
Merge branch 'master' of
ssh://git@github.com/CaptureTheTrack/testapp_server.git

Conflicts:
	.classpath

Signed-off-by: John Kapri <john.kapri@gmx.net>