Merged master fixed conflict.
Merged master fixed conflict.
Merged master fixed conflict.
Merge branch 'development' of http://github.com/open-integer/integer into development

Conflicts:
	server/src/main/java/edu/harvard/integer/service/discovery/snmp/ParentChildServiceElementDiscovery.java
Merge branch 'development' of http://github.com/open-integer/integer into development
INT-442 and INT466 check in and bugs fix on category changes.