Original master changes merged

Master changes merged up to and including "Categories InfoBox Clean Up"