restarting the bad merger
reverted to da17ff319fe...
Merge branch 'master' of github.com:sauln/ICRA2015