Re-write Admin Settings
Merge remote-tracking branch 'upstream/evolution' into evolution

Conflicts:
	src/classes/Settings.php
	src/js/admin.js