Start of transition to Theme.Holo

Merged Branch holo with Branch Development to reduce amount of branches