deleted some files we weren't using, and added an alert view on Addlocation to check if location name is blank
Merge remote-tracking branch 'origin'