More Cooja Simulation Configurations
Returnig all the MRM properties
Merge branch 'master' of https://github.com/mfer/udgo

Conflicts:
	contiki/tools/cooja/apps/udgo/java/org/contikios/udgo/UDGO.java