fix for firefox - requesting json explicit
alarms  now show names for items
changed some fields for locations
Merge remote-tracking branch 'origin/master'

Conflicts:
	ddsc_api/static/ddsc_api/management/scripts/logicalgroup.js
	ddsc_api/static/ddsc_api/management/scripts/shared_classes.js