Demand response

Merge demand response and prediction models to the master branch.