Preparation for the fat lady

Changed the common branches to kitkat