Integrating scheduling and control for economic MPC of buildings with energy storage