Merge into master from pull request #310:
Add LogMessageDoc annotation and some initial work at documenting lo... (https://github.com/floodlight/floodlight/pull/310)
Merge into master from pull request #311:
return correct ToS bits (https://github.com/floodlight/floodlight/pull/311)
Merge remote-tracking branch 'floodlight/master' into spoofing
Introducing rate control in sending BDDP messages, quarantining ports as they join the network, change API getEnabledPorts().
Merge pull request #312 from sriniram/master

Introducing rate control in sending BDDP messages, quarantining ports as they join the network, change API getEnabledPorts().
Add tons of log message documentation
Merge branch 'master' of github.com:floodlight/floodlight

Conflicts:
	src/main/java/net/floodlightcontroller/topology/TopologyManager.java
Merge into master from pull request #313:
Add tons of log message documentation (https://github.com/floodlight/floodlight/pull/313)
Add one REST API call to Topology to get route between two attachment points
/wm/topology/route/{src-dpid}/{src-port}/{dst-dpid}/{dst-port}/json
Add python circuitpusher application built using floodlight REST API calls
created apps directory to store apps
Merge into master from pull request #314:
Add one REST API call to Topology to get route between two attachment po... (https://github.com/floodlight/floodlight/pull/314)
Fix show switch xxx features [BSC-2513]
Merge into master from pull request #315:
Fix BSC-2514 (https://github.com/floodlight/floodlight/pull/315)
Merge remote-tracking branch 'floodlight/master' into spoofing

Conflicts:
	src/main/java/net/floodlightcontroller/core/IOFSwitch.java
	src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
	src/main/java/net/floodlightcontroller/topology/TopologyManager.java
Whenever LDUpdates are applied, track to see if any links are updated. In addition, track if direct and tunnel links are updated.  createNewInstance will create a new topology instance only when links are updated.
Merge pull request #317 from sriniram/master

Updates to createNewInstance() in Topology Manager.
Merge remote-tracking branch 'floodlight/master'
Merge remote-tracking branch 'floodlight/master' into misc
Fix BVS interface deletion bug

- event processing in cleanupEntities was exiting prematurely, some device delete
  updates were not being processed
- updated unittest to verify device deletion
- See BSC-2454
Merge into master from pull request #318:
BVS interfaces are not being cleaned up -- see BSC-2454 (https://github.com/floodlight/floodlight/pull/318)