New Braunfels City Hall moving to abandoned grocery store