Fixed merge conflicts, all business intelligence and associated tests complete except for Customer. All rspec and rake tests passing with 96% coverage