Merge branch 'master' into firewall_cookies

Makefile

build.xml

pom.xml

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

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

...net/floodlightcontroller/core/util/ControllerVersion.java

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

...odlightcontroller/core/web/ControllerVersionResource.java

...va/net/floodlightcontroller/core/web/CoreWebRoutable.java

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

...va/net/floodlightcontroller/topology/TopologyManager.java

src/main/java/net/floodlightcontroller/util/ActionUtils.java

src/main/resources/floodlightdefault.properties

src/main/resources/logback-test.xml

src/main/resources/logback.xml

.../java/net/floodlightcontroller/core/util/VersionTest.java

src/test/resources/logback.xml