Merged "Navigation pane merged with Video Player -FIXED" patch

resolved conflicts, 
removed .preview files
updated .gitignore file