exceptions and comments
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/java/rexos/mas/hardware_agent/HardwareAgent.java
bug fix
changed the SocketBehaviour.java. To not blocking
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development
aaa
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development
Merge branch 'development' of https://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into development