editing locations

admin panel can now edit locations
manual merge