adjusted naming
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/java/rexos/mas/hardware_agent/GripperModule.java
	src/java/rexos/mas/hardware_agent/HardwareAgent.java