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

Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/Device.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java