Woking on SPC-303. Refresh Operation reset layout
Merge branch 'master' into features/linkd-lldp
SPC-187, first step, add the ability to save topology
SPC-187, added the CreateGroupOperation
Better log for ToPr
Merge branch 'master' into features/linkd-lldp
Merge branch 'master' into features/linkd-lldp
Merge NRTG back into master now that it starts automatically

Squashed commit of the following:

commit e6584cce6fede39630bcfdf46eed953cab5d6155
Author: Matt Brozowski <matt@brozowski.com>
Date:   Fri Sep 14 09:28:05 2012 -0400

    add note in README that everything starts automatically

commit 4af9c264cac54f1d3791066bf40cdafa24244ad6
Author: Matt Brozowski <matt@brozowski.com>
Date:   Fri Sep 14 09:25:37 2012 -0400

    create complete set of features for NRTG and ensure that the get started by default in opennms

commit aa636a9583db782e12f8b75d21698d626ad0cf10
Author: Markus Neumann <Markus@OpenNMS.org>
Date:   Thu Sep 13 16:16:31 2012 +0200

    refactoring to move jms part behind a jms free interface at nrtg web part

commit ffa4a87ebb7d1f89ca6d85b6f09f503741e5187c
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Sep 6 11:25:47 2012 -0400

    SPC-276 fix dependency management for activemq

commit b32d330536f42acde20360ae894cf3e935dacaed
Merge: 769efa8 5ebeb9f
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Sep 6 10:57:47 2012 -0400

    Merge remote-tracking branch 'origin/master' into features/nrtg-unrevert-and-fix-osgi

commit 769efa8eeec8984504b0638c5e7fe227437f5104
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Sep 5 13:20:31 2012 -0400

    Revert "Revert "Revert "Revert "added some karaf infos to NRTG README""""

    This reverts commit 89252b553c07081c4a4f0003b782d3e8b1a24630.

commit 8c51d5b0a7275107399706cc239b6031fb671a2c
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Sep 5 13:20:22 2012 -0400

    Revert "Revert "Revert "Revert "NRTG API mini cleanup""""

    This reverts commit f5ee274922b52c3d24be134f2a9877ce98264d86.

commit ac657d68cc905a33dba653c75fec45c46138ed79
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Sep 5 13:20:14 2012 -0400

    Revert "Revert "Revert "Revert "NRTG Feature Merge into Master""""

    This reverts commit 53ff6ef5b240df9279a665137db55989386e13aa.
adding support for better edge tooltips, SCP-325 & SCP-185
Update vertex to support tootipText, SPC-331
SPC-331 and SPC-335: added tooltip

Added Tooltip for Vertex and Edges
Implemented setTooltipText and
getTooltipText as from the
specifications
Revert "SPC-331 and SPC-335: added tooltip"

This reverts commit b3f44319eaad5d5b264053f1b40a0717a9b2a5e6.
Brokes the topologyprovider for dependency
 SPC-331 and SPC-335: refactored for dependency
More clean class
Better refactoring for class
Resolved a typo: wrong classname AlarmDao
Fixed a type in class

This will fix a nullpointerException
Merge branch 'features/linkd-lldp'

Conflicts:
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/java/org/opennms/features/topology/plugins/topo/linkd/internal/LinkdTopologyProvider.java
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Merge branch 'features/linkd-lldp'

Fixed comflicts
 Merge branch 'features/linkd-lldp'

Fixed merge