updates demo pages with latest player
merges remote and local