Third pull

Settings, Plugins and Users on the way.
Btw, I think I accidentally pushed my config.php so beware of that before merging with master.