initial combatState fixes
Merge branch 'master' into combat_system
updated combat state to work with libgdx; combat system enhancements
readded resource changes on effects