Config
Merge branch 'master' of https://github.com/hahnjas/MobDev_rUonTime/
small changes, renamed