save change
Merge commit '2637f928717580fc6135ac434de69ab91def85ee' into development

Conflicts:
	server/src/main/java/edu/harvard/integer/service/managementobject/snmp/SnmpObjectManager.java
Add eclipse plugin
remove application plugin