added crisis to location and removed user from location, added nested location attribute to crisis