Normalize line endings (issue #1864)
Fix delete tv logo (issue #1900)
Merge branch 'master' of https://github.com/azhurb/stalker_portal