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

Conflicts:
	src/main/java/net/floodlightcontroller/core/internal/CmdLineSettings.java
	src/main/java/net/floodlightcontroller/core/internal/Controller.java
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java
	src/test/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusherTest.java