Successfully building for the nx platform
Merge branch 'develop' into runonhardware
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
Merge branch 'develop' into runonhardware
Upsets now use json instead of xml
Forgot to add client side modifications
Merge branch 'jsonify_upsets' into develop
Tidy up of screen layout
Build with cjson changes on nx platform
Merge branch 'develop' into runonhardware
Removed unused files.
Removed unnecessary 61850Attach/Detach - Attach is called once on init.
Added users ajax.
Added id
Controls now implemented without needing contorl file
Merge branch 'runonhardware' of ssh://192.168.0.157/src/nx-bsp/applications/displayserver into controls

Conflicts:
	server/main.c
Added logout feature