Relocates the login/logout templates
Undoes a duplicate local_settings import in 38032ad4
Fixes merging local settings installed apps
Implements a password reset system