Adding Qt build commands
Merge conflict
Removing DAKOTA checks that failed on new build
Merge branch '1.3.4-PRE' of github.com:NREL/OpenStudio into 1.3.4-PRE
Merge branch '1.3.4-PRE' of github.com:NREL/OpenStudio into 1.3.4-PRE
Merge branch '1.3.4-PRE' of github.com:NREL/OpenStudio into 1.3.4-PRE
Fixing CMake text for linux
Merge branch '1.3.4-PRE' of github.com:NREL/OpenStudio into 1.3.4-PRE

Conflicts:
	openstudiocore/CMakeLists.txt