Make a basic user model including secure passwords
Welcome flash fix
fix merge issues
fix merge issues