Merge cloudpc:/home/vsu/workspace/src/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
Merge branch 'master' of https://github.com/IDSCETHZurich/rapyuta-mapping
fix map parameters