add support for djangorestframework 2.x branch
Resolve merge conflict
Update CHANGES.rst
Add dummy demand/evaporation data. Saving work in progress.