A student whose short, pink dress caused a near riot at a private college and led to her expulsion will be allowed to return to classes.