Start of user administration
Not sure how those files got there
Merge remote-tracking branch 'upstream/master'