Resolved the merge conflicts with master

build.xml

lib/asm-3.0.jar

lib/asm-tree-3.0.jar

lib/cobertura-1.9.4.1.jar

lib/jdeb-1.0.1.jar

lib/log4j-1.2.9.jar

lib/openflowj-3.0.0-SNAPSHOT-javadoc.jar

lib/openflowj-3.0.0-SNAPSHOT-sources.jar

lib/openflowj-3.0.0-SNAPSHOT.jar

lib/oro/jakarta-oro-2.0.8.jar

logback.xml

pom.xml

.../java/net/floodlightcontroller/accesscontrollist/ACL.java

...ightcontroller/accesscontrollist/web/ACLRuleResource.java

...floodlightcontroller/core/IFloodlightProviderService.java

...floodlightcontroller/core/IReadyForReconcileListener.java

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

...loodlightcontroller/core/internal/FloodlightProvider.java

.../floodlightcontroller/core/internal/IOFSwitchService.java

.../floodlightcontroller/core/internal/OFChannelHandler.java