Fixed the administration URL
Made the admin login more generic
Merge branch 'master' into aufildusouffle