merge with trunk

.gitignore

build.xml

floodlight.sh

src/main/images/Floodlight Icons.sketch/Data

...main/images/Floodlight Icons.sketch/QuickLook/Preview.png

...in/images/Floodlight Icons.sketch/QuickLook/Thumbnail.png

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

...in/java/net/floodlightcontroller/counter/CountSeries.java

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

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

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

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

.../floodlightcontroller/flowcache/FlowReconcileManager.java

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

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

.../floodlightcontroller/linkdiscovery/web/LinkWithType.java

...floodlightcontroller/linkdiscovery/web/LinksResource.java

...main/java/net/floodlightcontroller/packet/BasePacket.java

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