Fix character animation states
merge
Merge branch 'master' of github.com:esjay/purplemonkeygamejam-june-2014