deactivate demo mode for signed in users; fix for toolbar buttons;
Merge branch 'minimal', remote-tracking branch 'origin'