Merge remote-tracking branch 'upstream/master' into hostparam

.gitignore

README.md

README.txt

build.xml

findbugs-exclude.xml

setup-eclipse.sh

...ava/net/floodlightcontroller/core/FloodlightProvider.java

...floodlightcontroller/core/IFloodlightProviderService.java

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

...main/java/net/floodlightcontroller/core/OFSwitchBase.java

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

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

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

...ightcontroller/core/module/FloodlightModuleException.java

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

...t/floodlightcontroller/core/module/IFloodlightModule.java

...lightcontroller/core/module/IFloodlightModuleContext.java

...floodlightcontroller/core/web/ControllerRoleResource.java

...net/floodlightcontroller/core/web/SwitchRoleResource.java

...t/floodlightcontroller/core/web/SystemUptimeResource.java