Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java

Fix race condition in device AP learning with topo change, and remove DM from link events.

Correct race condition in device learning and topology, remove deviceManager from listening linkEvent

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java

This reverts commit 0ae432f4.

Conflicts:

	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

Remove a character because of compilation warning (https://github.com/floodlight/floodlight/pull/93)

Fix race condition in device AP learning during topology convergence.

Fix listener sorting for partially-ordered dependencies (https://github.com/floodlight/floodlight/pull/91)

Conflicts:
	src/main/java/net/floodlightcontroller/core/internal/Controller.java
	src/main/java/net/floodlightcontroller/topology/TopologyManager.java

Add IHARoleListener interface so modules can listen for role changes. (https://github.com/floodlight/floodlight/pull/90)

2 - Update module HA role change actions
3 - Add unit tests for HA role changes

Conflicts:
	src/main/java/net/floodlightcontroller/topology/TopologyManager.java

Cleanup of topology manager to match floodlight style.  Remove StackTraceUtil.  Add packet-in listener to topology

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

Remove useless IStaticWebRoutableService (https://github.com/floodlight/floodlight/pull/89)

module provides no services.

Web UI (https://github.com/floodlight/floodlight/pull/87)

reset device AP conflict algorithm computation after topology changes (https://github.com/floodlight/floodlight/pull/88)