Now utilising websockets (Primefaces Push is not available on glassfish)
There is a problem whereby the websocket comms runs away with itself
googleMaps and openmaps have a few issues regards to URI encoding
Now utilising websockets (Primefaces Push is not available on glassfish)
There is a problem whereby the websocket comms runs away with itself
googleMaps and openmaps have a few issues regards to URI encoding
Merge origin/master

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml