Merged changes between server and local
Major update to make the admin pages more generic.  Severely reduced repeated code in all admin handlers and templates.