Merge branch 'master' into InheritanceRefactor

Conflicts:
	Broker/src/CClockSynchronizer.cpp
Merge pull request #381 from FREEDM-DGI/InheritanceRefactor

DGI Module Inheritance Refactor
Merge branch 'master' into Issue374