Further colour fixes
Merge branch 'master' of https://github.com/smamol/magiccardwall_ios