add settings conf
clear devise views
small drying
Merge branch 'master' of https://github.com/StudProtal/stud_portal into style
tmp