Fix mental points
Merge branch 'master' of https://github.com/nodoxi/phobia

Conflicts:
	Assets/Sprites/Animations/Girl/PersonGirlAnimationController.controller
Merge branch 'master' of https://github.com/nodoxi/phobia