Merge branch 'development' of http://github.com/open-integer/integer into development

Conflicts:
	server/src/main/java/edu/harvard/integer/service/discovery/ServiceElementDiscoveryManager.java