commit
Merge remote-tracking branch 'origin/development/architecture' into
development/architecture

Conflicts:
	Incubator-main/munca/ChangeDetectorModule.java