Boss fix and cheat unfix
Merge remote-tracking branch 'origin/master'