updated objects and locations for experiment 2
Merge pull request #1 from mxcreator/master

Update of location files and objects to spawn for experiment 2.
Merge branch 'master' of github.com:ipa320/srs_public
position update: pizza box nav1, green tea removed in nav1
new folders added to spawn objects in experiment 2: base and e2task_maps
new 2D map added
Merge pull request #2 from mxcreator/master

Updates for experiment 2
Task renamed.
New topic name for tactile data.
Merge pull request #120 from ZdenekM/master

Update to srs_user_tests