Merge into master from pull request #305:
Send reverse LLDP only when the received messages is forward LLDP (and not BDDP). (https://github.com/floodlight/floodlight/pull/305)
Merge remote-tracking branch 'floodlight/master' into spoofing
FL-83/FL-84 Add REST API and Java API to retrieve a list of virtual networks and hosts associated.
Merge into master from pull request #306:
FL-83/FL-84 Add REST API and Java API for VNF  (https://github.com/floodlight/floodlight/pull/306)
BSC-2475: Handle rest output for port numbers larger than 32K
Fix floodlight counter creation issue
Merge into master from pull request #307:
BSC-2322 Fix counter creation issue (https://github.com/floodlight/floodlight/pull/307)
Merge into master from pull request #308:
Support for larger port numbers in REST API (https://github.com/floodlight/floodlight/pull/308)
Add VNF unit tests for added REST API
Minor code fix in VNF
Add logback.xml back for developer use to control logging level
Fix git problem for compile problem due to missing file in previous pull request
Merge into master from pull request #309:
Add VNF unit tests for added REST API (https://github.com/floodlight/floodlight/pull/309)
Correct the getToS API to return the 6-bit value
Add LogMessageDoc annotation and some initial work at documenting the log messages in floodlight
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)