fixed if check
Merge branch 'dev' of github.com:OS2web/os2dagsorden into dev