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

Conflicts:
	Incubator-main/munca/ChangeDetectorModule.java
	Incubator-main/munca/DefaultMessageReceiver.java
	Incubator-main/munca/DefaultNetLink.java
	Incubator-main/munca/FileChangeData.java
	Incubator-main/munca/FirstDetected.java
	Incubator-main/munca/Main.java
	Incubator-main/munca/Main_server.java
	Incubator-main/munca/OutsideTimer.java
	Incubator-main/munca/PCInterface.java
	Incubator-main/munca/SenderModule.java
	Incubator-main/munca/SenderTimer.java
	Incubator-main/munca/ServerModule.java
	Incubator-main/munca/WirelessModule.java
	Incubator-main/munca/package-info.java
	Incubator-main/munca/test.java
	Incubator-main/munca/test_client.java