Show current label on mouse move.
Fix get_segmentation_id.
Support ? queries for urls on the serverside.
Add 3D rendering.
First successful websocket connection exchanging a merge table between two clients.
Some debug output regarding websockets.
Propagate merges to all clients.
Add log for merge actions.
Fix mousewheel zooming in Firefox.
Latest changes.
Merge branch 'merging' into change_webserver

Conflicts:
	dojo.py