Set PSCAD on.
Merge branch 'master' of github.com:scj7t4/FREEDM

Conflicts:
	Broker/CMakeLists.txt
Merge branch 'master' of github.com:scj7t4/FREEDM
Merge branch 'master' of github.com:scj7t4/FREEDM
Merge branch 'master' of github.com:scj7t4/FREEDM