Several Fixes for webcat

Fixed all the errors that webcat was giving us
Merge branch 'Master' of https://github.com/sjacob95/TileTraveler into Master