added support for video thumbnail from content uri
Merge
Removed redundant file
Clean code
Merge branch 'lolevsky-master'