merge from youtubeplayer and cloud sync branch