One more Merge
merge
Merge branch 'master' of https://github.com/Sellene/VVS

Conflicts:
	Application/VVS/VVS System/Content/Videos/Posters/Thumbs.db
	Application/VVS/VVS System/Content/Videos/Thumbs.db