scvadvavasbvsdegsebvsebvgsevsdvsebvsbfh,kgfguhbsej
Merge branch 'geka-work-3' into nir-4

Conflicts:
	src/icm/intent/GrabStatisticsIntent.java
	src/icm/server/intenthandler/GrabStatisticsIntentHandler.java