Merge branch 'develop' into 51094531_GndHXVertical

Conflicts:

openstudiocore/src/openstudio_app/Resources/hvaclibrary/hvac_library.osm
Fix merge conflict in hvac_library.osm
[#53022305] partial bug fix.
[#53022305] QGridLayout delete, formatting, billPeriod header fix, Calender workaround.
Finishing up addition of DataPoint features. Changing osp to support DataPoint::selected and DataPoint collecting multiple report.xml files. Changed AnalysisDriverFixture test that was showing how to append more results onto the existing report.xml to show how multiple xmls are collected.

[#54066093]
[#54074653]
make qaqc export work on non-developer machines
Merge pull request #461 from NREL/54815246-RubyPackagingForCloudProvider
Initial implementation of VagrantProvider

[#54849080]
add conditionals to check null pointers in attach
Merge pull request #459 from NREL/qaqc_fix
VagrantProvider working on Windows

[#54849080]
Merge pull request #462 from NREL/54849080_VagrantProvider

54849080 vagrant provider
Merge branch 'develop' of github.com:NREL/OpenStudio into develop
Merge branch 'develop' into 20130820_ETH_DataPointChanges_54066093_54074653

Conflicts:
	openstudiocore/src/analysisdriver/SimpleProject.cpp

Also fixing some test failures.

[#54066093]
[#54074653]
Initial communication with OSServer, need to talk with Elaine or Alex about how to parse returned JSON

[#55676990]
Fixing build errors on Linux [#0]
Test passing. Also added test to check Analysis::updateInputPathData.

[#54066093]
[#54074653]
Merge branch '20130820_ETH_DataPointChanges_54066093_54074653' of https://github.com/NREL/OpenStudio into 20130820_ETH_DataPointChanges_54066093_54074653
Merge branch 'develop' into 20130820_ETH_DataPointChanges_54066093_54074653
Simplifying openstudio::loadJSON. Putting version-extraction functionality in separate helper function.

Addressing Nick's review comment regarding server information being directly under "metadata", not under "metadata.server_view".

[#54066093]
[#54074653]