conflicting file
Merge branch 'master' of https://github.com/TimJuni/strapping-mediawiki
added preferences Dropdown