fixes and mnore fixes
Merge branch 'master' of https://github.com/ishan-bsb/candikrush