Remove depricated UIAccelerometer methods.
Resolve merge conflicts