Merge remote-tracking branch 'floodlight/master' into spoofing

.gitignore

logback.xml

...dlightcontroller/core/annotations/LogMessageCategory.java

.../floodlightcontroller/core/annotations/LogMessageDoc.java

...floodlightcontroller/core/annotations/LogMessageDocs.java

...va/net/floodlightcontroller/core/internal/Controller.java

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...a/net/floodlightcontroller/core/internal/RoleChanger.java

...n/java/net/floodlightcontroller/counter/CounterStore.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

src/main/java/net/floodlightcontroller/routing/Link.java

...java/net/floodlightcontroller/topology/NodePortTuple.java

...ightcontroller/virtualnetwork/IVirtualNetworkService.java

.../floodlightcontroller/virtualnetwork/NetworkResource.java

...t/floodlightcontroller/virtualnetwork/VirtualNetwork.java

...dlightcontroller/virtualnetwork/VirtualNetworkFilter.java

...htcontroller/virtualnetwork/VirtualNetworkSerializer.java

...tcontroller/virtualnetwork/VirtualNetworkWebRoutable.java

src/main/resources/quantum.properties

...htcontroller/virtualnetwork/VirtualNetworkFilterTest.java