Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code