Fixing bugs & features...
Merge branch 'master' of https://github.com/tpejsa/ZombieHorse

Conflicts:
	tools/zhAnimationStudio/src/AnimationStudioApp.cpp
	tools/zhAnimationStudio/src/OgreWindow.cpp
Merge branch 'master' of https://github.com/tpejsa/ZombieHorse