add sensors again
fix calibration
Merge branch 'master' of https://github.com/ipa320/automatica2014
change controller name
remap planing scene
fix namesace