Conflicts:
	src/main/resources/web/js/models/hostmodel.js

Add a debug REST API to get raw device entities.  Fix attachment point blocking code and make it appear in the REST output

Note: Switch stats don't update yet...not sure why...coming next.

    topology ui: more error checking  (https://github.com/floodlight/floodlight/pull/105)

    topology ui: show vendor names in switch view  (https://github.com/floodlight/floodlight/pull/104)

topology ui bugfix: don't assume hosts have ips (https://github.com/floodlight/floodlight/pull/103)

topology viewer was dying if floodlight had not yet discovered
an IP address for every host.

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

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

Add support for generating test coverage using cobertura (https://github.com/floodlight/floodlight/pull/102)

Enhance TopologyManager REST API. (https://github.com/floodlight/floodlight/pull/101)

Removing a couple placeholders unlikely to be filled in for the near future.  Would be great to get uptime but have no api for it right now.

Online javascript files (https://github.com/floodlight/floodlight/pull/99)

Reenabled the mechanism for initializing the HA role of the controller from a file (https://github.com/floodlight/floodlight/pull/100)

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

Change host/switch identification to use IDs instead of names in web topology view.  Add last seen host IP address.

Wait instead of sleep in unit test (https://github.com/floodlight/floodlight/pull/96)

minor toString fix in Device

Move the switch learning table out of IOFSwitch and into the LearningSwitch module. (https://github.com/floodlight/floodlight/pull/95)