Spacing fixed in user class.
Merge remote-tracking branch 'origin/master'
Started simplifying Admin plugin.