Merge pull request #323 from alexreimers/master

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

...dlightcontroller/core/internal/OFFeaturesReplyFuture.java

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

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

...lightcontroller/core/web/AllSwitchStatisticsResource.java

...net/floodlightcontroller/core/web/SwitchResourceBase.java

...oodlightcontroller/core/web/SwitchStatisticsResource.java

.../java/net/floodlightcontroller/counter/SimpleCounter.java

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

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

...main/java/net/floodlightcontroller/firewall/Firewall.java

...a/net/floodlightcontroller/firewall/FirewallDecision.java

...a/net/floodlightcontroller/firewall/FirewallResource.java

.../java/net/floodlightcontroller/firewall/FirewallRule.java

.../floodlightcontroller/firewall/FirewallRulesResource.java

...a/net/floodlightcontroller/firewall/IFirewallService.java

.../floodlightcontroller/flowcache/FlowReconcileManager.java

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