Added barTintColor
Fixed merge conflicts.