Added some admin stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/Plugins/General/Admin/Plugin.php