fixed merge conflicts
Merge branch 'dev' of https://github.com/phasenkasper/Showmator into dev