Minor bug fixes
Merge branch 'master' of https://github.com/INOVA-Technology/Zombie-Smack-Down

Merged stuff
Fixed upgrade functions (not complete)