Merged "Navigation pane merged with Video Player -FIXED" 

. Resolved conflicts
. removed .preview files
. updated .gitignore file