Merge branch 'master' of github.com:alexreimers/floodlight

...ghtcontroller/devicemanager/internal/AttachmentPoint.java

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

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

...t/floodlightcontroller/devicemanager/internal/Entity.java

...lightcontroller/devicemanager/internal/IndexedEntity.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

...et/floodlightcontroller/firewall/FirewallWebRoutable.java

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

.../net/floodlightcontroller/firewall/RuleWildcardsPair.java

...java/net/floodlightcontroller/firewall/WildcardsPair.java

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

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

...odlightcontroller/storage/memory/MemoryStorageSource.java

...es/net.floodlightcontroller.core.module.IFloodlightModule

src/main/resources/floodlightdefault.properties

...loodlightcontroller/core/test/MockFloodlightProvider.java