Merge remote-tracking branch 'bigswitch/master'

Conflicts:
	bigcon/urls.py
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/manager/internal/BVSManagerImpl.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRouterManager.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRouting.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/forwarding/Forwarding.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/forwardingvta/ForwardingVTA.java
	floodlight/src/main/java/net/floodlightcontroller/core/FloodlightProvider.java
	floodlight/src/main/java/net/floodlightcontroller/core/internal/Controller.java