adjust for margin in g element
account for margin in pan calculation
change edge update animation
Updated JIRA troubleticket plugin to support the new JIRA REST API.
Moved JIRA and OTRS ticketing plugins into features/ticketing.
Moved RT ticket integration into features/ticketing.
add atom support to the ReST interfaces
refactor criteria to use Collections rather than Lists when possible
major refactoring and cleanup; more objects, pass alarm data
bad dep from a merge
Added Spring JAXB version back to top-level POM to fix opennms-base-assembly.
Adding support for GeoLocation on the assets page.
Removed deprecated Vulnscand and associated web UI from OpenNMS. This
vulnerability scanner system relied on Nessus which is no longer
available under an open-source license and was poorly integrated with
the rest of the OpenNMS object model.
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms
Merge branch 'master' into TN-master

fixed Conflicts and moved remedy-in tegration to features/ticketing

Conflicts:
	integrations/pom.xml