Merge pull request #114 from Kiroshima/master

Case Object Conditions Added
Convo atlas fixing
Merge https://github.com/JohnMai/WhiteSharks