better Login/Register menu entries in menu
Merge remote-tracking branch 'origin/master'