Merge branch 'master' of github.com:kjiang/bigswitchcontroller

Conflicts:
	bigfloodlight/src/main/java/com/bigswitch/floodlight/bvs/web/ExplainResource.java
	bigfloodlight/src/main/java/com/bigswitch/floodlight/forwarding/Forwarding.java
	bigfloodlight/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
	bigfloodlight/src/main/resources/bigfloodlight.properties
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/serviceinsertion/internal/ServiceInsertionServiceEndToEndTest.java