BREAKING CHANGE: abstracted the Economy interface. 
resolve merge conflicts with upstream
update pom.xml for new CB version