Renamed Popup->  Timechooser; removed QuickPrefs, showsettings
Merge branch 'working_activities' of https://github.com/gruppe1/EHSKApp into working_activities