Settings regrouping
Merge branch 'dev' of git://github.com/bellcom/os2dagsorden into dev
Merge branch 'dev' of https://github.com/bellcom/os2dagsorden into dev