Successfully building for the nx platform
Merge branch 'develop' into runonhardware
Added some basic JSON controls and login popup.
Latest UKPN config that  runs on the NX hardware generating status upsets
Merge branch 'runonhardware' into develop
Merge branch 'controls' of https://github.com/doddi/displayserver into develop

Conflicts:
	server/Makefile
	server/websockethandler.c