Fixed some problems
changed character controller
Fixed Merge Conflict