Refactored the Animator class and changed some method calls in GameView
Changed caption on some final variables
Merge branch 'animation-refactor' into develop