Made minor changes to Registration module, merged registration and login into user_controller