release 1.0
Merge branch 'release/1.0'
fixing up libraries
just adding types to generics
cleanup
cleanup
refactoring
refactoring
Nagios recovery SOAP working
Merge branch 'origin/master'

Conflicts:
	.classpath
	tools/setclasspath