update javadoc
Fix for authenticating users into a user directory when no current user
Merge remote-tracking branch 'upstream/master'