few updates
Merge branch 'master' of https://github.com/modusdigital/UEL-pub

Signed-off-by: James <james@method.org.uk>

Conflicts:
	js/main.js
	namedconfig.xml
Merge branch 'master' of https://github.com/modusdigital/UEL-pub
Merge branch 'master' of https://github.com/modusdigital/UEL-pub

Signed-off-by: James <james@method.org.uk>

Conflicts:
	index.html