update for 6.1 final, code cleanup, use AVKit instead of MPMoviePlayer