Users cannot remove themselves from being users. Some other files also changed.
Merge gitHub/master