action texture switching.
Sam's master
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into ActionAnimations
Merge pull request #19 from TinasFu/ActionAnimations

Action animations
Action Animation merged with upstream master.
Merge pull request #20 from TinasFu/ActionAnimations

Action Animation merged with upstream master.
Merge remote-tracking branch 'upstream/master' into brianbranch