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

.gitignore

apps/circuitpusher/circuitpusher.py

build.xml

floodlight.sh

logback.xml

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

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

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

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

...java/net/floodlightcontroller/core/IOFSwitchListener.java

...net/floodlightcontroller/core/OFMessageFilterManager.java

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

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

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

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

.../floodlightcontroller/core/internal/OFMessageDecoder.java

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

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

...dlightcontroller/core/module/FloodlightModuleContext.java

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