Changes in add-device.html template
Merge branch 'experimental' of https://github.com/project-nms/nms_code into experimental

Conflicts:
	nms_root/nms/templates/nms/add_device.html
Merge branch 'experimental' of https://github.com/project-nms/nms_code into experimental
Template fix