fix the bugs
Merge branch 'TB' of https://github.com/ElectricSheep68/MyUnityGame into TB

Conflicts: