Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into LB

.gitignore

build.xml

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

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

...odlightcontroller/core/module/FloodlightModuleLoader.java

...t/floodlightcontroller/devicemanager/internal/Device.java

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

.../net/floodlightcontroller/flowcache/OFMatchReconcile.java

...loodlightcontroller/flowcache/PortDownReconciliation.java

.../java/net/floodlightcontroller/forwarding/Forwarding.java

...t/floodlightcontroller/learningswitch/LearningSwitch.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

src/main/java/net/floodlightcontroller/packet/LLDP.java

src/main/java/net/floodlightcontroller/packet/LLDPTLV.java

...java/net/floodlightcontroller/routing/ForwardingBase.java

...oodlightcontroller/staticflowentry/StaticFlowEntries.java

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

...a/net/floodlightcontroller/topology/ITopologyService.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

...va/net/floodlightcontroller/topology/TopologyManager.java