Bugfix #826
Catched another exception
Bugfix #795
Fixed code conventions in user settings, changed top-level page names
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
Merge remote-tracking branch 'glorf/master'