Fixed several combat bugs
Several bug fixes
Merge pull request #1 from jonnymalingo/develop

Combat & other bug fixes, more iOS 7 compatibility