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/containment/ContainmentGenerator.java
Merge branch 'development' of http://github.com/open-integer/integer into development
Merged master fixed conflict.
Mearge from remote.
Merged master fixed conflict
Merged master fixed conflict
Merge branch 'development' of http://github.com/open-integer/integer into development

Conflicts:
	common/src/main/java/edu/harvard/integer/common/topology/ServiceElementType.java
	server/src/main/java/edu/harvard/integer/service/discovery/element/ElementDiscoverTask.java
Merge commit.
Merge commit.
Merge branch 'development' of http://github.com/open-integer/integer into development
Check in for INT-359,  INT-239, INT-341,  INT-358, INT-360, INT-342