Added new animations; changed character controller
merge