#933 Rollup of changes from UVic,

[nikhilgupta10]

Reintegrate bug fixes to 3.1 done at UVic during summer/fall 2014. Specific changes:

1) fix code block buffer clearing issues in core/load.c 2) add support for composite load model and fix enduse/loadshape data structures in gridlabd.h 3) add support for changing the market clearing price variable name in triplex_meter 4) add support for new BSRA loadshapes in house.cpp ,

[nikhilgupta10]

nikhilgupta10 imported these comments from Sourceforge: The user dchassin does not exist anymore. Therefore assigning this to afisher1. "dchassin":- status: new --> assigned

• assigned_to: Andy Fisher
• Milestone: Unscheduled --> Version 3.2 RC1

• Resolution: none --> validate ,

  "dchassin":,

  "dchassin":Core, market, powerflow and residential changes have been moved into 3.2. New module additions remain in ticket.,

  "dchassin":- assigned_to: Andy Fisher --> David P. Chassin

• Milestone: Version 3.2 RC1 --> Knothole Interim ,

  "dchassin":These changes need to be incorporated into trunk before the knothole.,

  "andyfisher":Can this ticket be closed after integration?,

  "dchassin":Yes,

  "andyfisher":- status: assigned --> closed ,

  "andyfisher":This ticket was already merged into Trunk. Verfied this at r5525. Closing ticket,