Move service element disciminator
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	server/src/main/java/edu/harvard/integer/service/discovery/ServiceElementDiscoveryManager.java
	server/src/main/java/edu/harvard/integer/service/discovery/ServiceElementDiscoveryManagerInterface.java
Merge remote-tracking branch 'origin/development' into development
Set ID on ManagementObjectValues before saving the ServiceElement
Set address so hostname does not have to be looked up