fixed bug with using consumables
minor change to levelUpState

levelUpState now shows how many points have been put into a stat without
scaling
Merge remote-tracking branch 'origin/master' into BillyDevBranch
Merge remote-tracking branch 'origin/master' into BranDev-Branch