added support for dhw_load_control col
Merge branch 'master' of github.com:Hawaii-Smart-Energy-Project/Maui-Smart-Grid
Merge branch 'master' of github.com:Hawaii-Smart-Energy-Project/Maui-Smart-Grid