map integrated, one acceptance test passed
Fixed merge conflicts