Merge branch 'develop' into PAT-EC2

Conflicts:
	openstudiocore/src/pat_app/RunView.hpp
Merge branch 'PAT-EC2' of github.com:NREL/OpenStudio into PAT-EC2