Merge branch 'master' into mcl-rewrite

diff --cc src/robofsm/eb2008/Makefile.omk
Simple merge

diff --cc src/robofsm/eb2008/robot_eb2008.h
index 7e42110aa24323be56c52358b8ecb389f11b9f4a,d347c862ce1d8bfbc750c179497879e3e4284b2a..af1d35fda3c2a4d2af2131bdcd12839faa90cf24
--- 1/src/robofsm/eb2008/robot_eb2008.h
--- 2/src/robofsm/eb2008/robot_eb2008.h
+++ b/src/robofsm/eb2008/robot_eb2008.h
@@@ -114,10 -116,12 +116,13 @@@ struct robot_eb2008 
        struct eb2008_orte_data orte;
        struct generic_orte_data gorte;
  
+       /* sensors */
+       struct sharps_type sharps;
+ 
        /* mcl */
 -      struct mcl_model mcl;
 -      struct mcl_angles meas_angles;;
 +      struct mcl_model *mcl;  /* Pointer to the generic MCL model */
 +      struct mcl_laser laser; /* MCL implementation for laser */
 +      struct mcl_laser_measurement meas_angles;;
        unsigned char use_loc;
  
  }; /* robot_eb2008 */