Fixed jumping and platform collision, ending branch and merging with master