Disabled features based on whether or not the user has logged in or not
Merge remote-tracking branch 'origin/master'