Squashed commit of the following:

commit bd77329e2dceef110dbed5fbabae178e702ae1dd
Author: leis <leishi.mail@gmail.com>
Date:   Tue Apr 9 12:40:28 2013 +0100

    swithing to master

commit e9e1c664f961f47ea79bbe1b3ac42a51788dce6b
Author: leis <leishi.mail@gmail.com>
Date:   Thu Apr 4 17:34:42 2013 +0100

    minor bug fixed

commit bd019a904d7db577bd64dbbf53fdd82cae4d5e3a
Merge: 094518c c57cd2e
Author: leis <leishi.mail@gmail.com>
Date:   Thu Mar 28 12:17:50 2013 +0000

    Merge remote-tracking branch 'renxi/master' into testing

commit c57cd2e1284c735b259c2644f48ababbaa427106
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Thu Mar 28 12:14:49 2013 +0000

    service to topic bridge for UI confirmation

commit 094518c4e2bf2d6ac05fc790addbb5a885671a7d
Author: leis <leishi.mail@gmail.com>
Date:   Wed Mar 27 11:27:13 2013 +0000

    echo server

commit 2251a92cd328cac4fd4311d9916f226e044ea9e1
Author: leis <leishi.mail@gmail.com>
Date:   Mon Mar 25 17:17:57 2013 +0000

    fixed

commit e032dc83d0765dd67da5d46cf334de62ecfc404b
Author: leis <leishi.mail@gmail.com>
Date:   Mon Mar 25 16:04:59 2013 +0000

    merged with renxi

commit 47444321274e56a45710c4469f58fc17320f450c
Merge: 568d5e6 b725183
Author: leis <leishi.mail@gmail.com>
Date:   Mon Mar 25 14:44:07 2013 +0000

    using ours

commit 568d5e6e3efb77c37217e77b566b98840439a88c
Author: leis <leishi.mail@gmail.com>
Date:   Mon Mar 25 14:39:08 2013 +0000

    backup

commit d110cbab06861e3805f97531893a87bf633605df
Author: leis <leishi.mail@gmail.com>
Date:   Mon Mar 25 13:38:01 2013 +0000

    planned arm

commit b725183d4b9bc28b5690055d3452e89bcddb4506
Merge: d3d34de a5e1cf8
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Mar 25 10:07:44 2013 +0000

    mdl cob_manipulation compability fix

commit d3d34de9b528df05590fb990758dd4a16e3ca907
Merge: 940ee32 5b4f6e8
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Mar 25 09:37:16 2013 +0000

    Merge remote-tracking branch 'manual/master'

commit 5b4f6e813726016298dbbb9ede8cffca864d1b70
Author: mrodriguez@robotnik.es <mrodriguez@robotnik.es>
Date:   Mon Mar 25 09:03:59 2013 +0100

    Fixed IK service name

commit a5e1cf8fa7440ef16e1764d41e698a3f9c9be0c5
Author: Mathias Lüdtke <mathias.luedtke@ipa.fraunhofer.de>
Date:   Fri Mar 22 18:49:56 2013 +0100

    fixed package name for kinematics node

commit 940ee32eabdcb7aa81d36cb40e16856141642411
Merge: 1ad5657 e8f6306
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Thu Mar 21 15:13:33 2013 +0000

    Merge remote-tracking branch 'origin-ipa320/master' into automerge

commit 1ad56579bcd84bd782251cbb33c8d481717f9c63
Author: mrodriguez@robotnik.es <mrodriguez@robotnik.es>
Date:   Wed Mar 20 18:10:50 2013 +0100

    Fixed old dependencies

commit 0a4a1fe6505e62511a0cf0cf45ad70659bfcd3fc
Author: mrodriguez@robotnik.es <mrodriguez@robotnik.es>
Date:   Wed Mar 20 18:09:39 2013 +0100

    Fixed old dependencies

commit 5ce479e40c0d3ebe1f98be8ad865cd8141f2a267
Author: mrodriguez@robotnik.es <mrodriguez@robotnik.es>
Date:   Wed Mar 20 18:08:10 2013 +0100

    Fixed old dependencies

commit a178a0f0c033763fbabe1e692ecb64a9128df17a
Author: mrodriguez@robotnik.es <mrodriguez@robotnik.es>
Date:   Wed Mar 20 18:05:45 2013 +0100

    Fixed old dependencies

commit 04cdd87e5b432ed3c367f59ea5214d512229754a
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Mar 20 14:43:35 2013 +0000

    revision on dependency due to the change in cob_manipulation

commit e8f63066bd939c2df1dea293c403cc367552b0ef
Merge: a9a5cd5 832800e
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Fri Mar 15 06:06:10 2013 -0700

    Merge pull request #113 from srs-user-tests/master

    Changes made in config files during the user tests

commit 832800eda19c1fe7218347dad71769dc871b5163
Merge: c45c6aa a9a5cd5
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 15 13:47:20 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit c45c6aa8625365d26311d0a3991ab499747f7715
Merge: ee11698 8118da3
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 15 13:46:46 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit ee1169853e775bc72b3e4775472e3afe2c548bc6
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 15 13:43:17 2013 +0100

    Changes made during the user tests

commit 18572ce8e89937827e6975ce3fc40e18dd86a3a5
Author: leis <leishi.mail@gmail.com>
Date:   Fri Mar 15 11:14:35 2013 +0000

    Remove the ignored directory

commit ab3809e7691140274ddd837dd910c13396212628
Author: leis <leishi.mail@gmail.com>
Date:   Fri Mar 15 11:09:34 2013 +0000

    Remove the ignored directory

commit 05ae9ad499582fbf4a2c032179bb6dcd0a143bdf
Author: leis <leishi.mail@gmail.com>
Date:   Fri Mar 15 11:08:39 2013 +0000

    Remove the ignored directory

commit 0303640748d7626e53e7301c8391ca9ab5aeaba5
Author: leis <leishi.mail@gmail.com>
Date:   Fri Mar 15 11:08:00 2013 +0000

    Remove the ignored directory

commit ed281ee54fcdb8a8adc1345397c68ac859f2e52c
Author: leis <leishi.mail@gmail.com>
Date:   Fri Mar 15 11:07:09 2013 +0000

    Remove the ignored directory

commit 7d8ef41f9dc4ad50f37f514f1b36545f9639b290
Author: leis <leishi.mail@gmail.com>
Date:   Fri Mar 15 11:06:21 2013 +0000

    Remove the ignored directory

commit 3f89913b5364e9979cf580d483ad46f88cf5faf6
Author: leis <leishi.mail@gmail.com>
Date:   Thu Mar 14 16:27:37 2013 +0000

    user interventionfunction added

commit 3b93c48d2fe0f256c89d24bc2798df22b293c6fb
Author: leis <leishi.mail@gmail.com>
Date:   Thu Mar 14 13:14:09 2013 +0000

    adding functions to get message and result from echo_server

commit 34c9b559aac0bcf93f6c5488be58c5c7e66936ee
Author: leis <leishi.mail@gmail.com>
Date:   Thu Mar 14 13:06:29 2013 +0000

    adding functions to get message and result from echo_server

commit 9bc99e562e4e21ff360dc4d89d38a79e869bbaeb
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Mar 13 12:13:32 2013 +0000

    ui_pro intervention initial change

commit b4e80ec6141bd548692a3a4d392168cf005ec0da
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Mar 13 12:05:08 2013 +0000

    ui_pro intervention initial change

commit a9a5cd5e99a52f657bf5cd42b0586eb1036e9de0
Merge: f2b462a 8118da3
Author: Nadia Hammoudeh García <nadia.hammoudeh-garcia@ipa.fraunhofer.de>
Date:   Wed Mar 13 02:02:31 2013 -0700

    Merge pull request #112 from srs-user-tests/master

    Preparations...

commit 8f8354ac4da06adc65ca26d9cada4d65b7ed8469
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Mar 6 17:46:07 2013 +0000

    manual command support

commit 8118da3cf477d6d278913211142988fa7c50eb40
Author: Zdenek Materna <imaterna@fit.vutbr.cz>
Date:   Mon Mar 4 15:18:06 2013 +0100

    Helper script for definition of ideal gripper position

commit 9e913a2d84a882d1209fefbaa0861ca701b33ee7
Author: Zdenek Materna <imaterna@fit.vutbr.cz>
Date:   Mon Mar 4 12:18:51 2013 +0100

    Ideal BB adjusting tool

commit c5a58a5db7f2f040392785de8d40e694e68c4f69
Author: Zdenek Materna <imaterna@fit.vutbr.cz>
Date:   Mon Mar 4 12:18:43 2013 +0100

    Ideal BB adjusting tool

commit 5537290f2e34ff69d000d3ed0d0ccaf36a7665dd
Merge: 7ab4315 d15b692
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Sat Mar 2 00:34:36 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 7ab4315bdaa83b60fa303d85402b4f60e6940731
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Sat Mar 2 00:34:24 2013 +0100

    position od bb and robot

commit d15b692bceb50034900316aaed2d3bb0b2add64e
Merge: 8327cdc 0245985
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Sat Mar 2 00:31:24 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 8327cdc540fd49319f2b6ad322d8cb0e70f182a8
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Sat Mar 2 00:31:09 2013 +0100

    final final final final final rviz settings

commit 02459858fbb705498318a22a72007f603d3b8573
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 22:39:58 2013 +0100

    add kinect to log

commit 6c10624e556b741af049d3738a67d9f76a42ab79
Merge: e1c7192 b8403f6
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 21:48:07 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit b8403f6cc28e1f04aa8ad3bb8ba9205583327e53
Merge: 72975f5 180427a
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 21:47:57 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit e1c71926ca74e2e86375a9ff6d36c6ea9f918eef
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 21:47:52 2013 +0100

    Updated inter. primitives

commit 72975f5a8ccd7e929bddcb73efb1999e4707db6d
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 21:47:29 2013 +0100

    Making things perfect...

commit 180427a02190471190a10762f2ceab4e4aded784
Merge: 667b57b 5825021
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 21:31:29 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 667b57b07aa587057980a46ce3e021540115ebbe
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 21:31:10 2013 +0100

    rviy config for training

commit 58250215014ef529adbd9d9a7024b24b6cf315f4
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 21:23:32 2013 +0100

    Update of man1 configuration and grasping presets

commit daec34509ef969923fb5f187cc4e93e9c6360088
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 18:18:48 2013 +0100

    Launch file for skipping BB placement

commit dd718f0827d0c2c51e085385cd4ecffec8171c13
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 17:45:44 2013 +0100

    Update of manip monitor.

commit 5a006698eb0d0c3776c2d9eb183fe0a9095636f0
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 17:00:53 2013 +0100

    disable pregrasps

commit 850ac5c55f068bf53ecdcc61e38512eb4dda72ed
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 16:42:03 2013 +0100

    config fix

commit 60102c6e50e81f6bb9f87440d858f7538a9e8440
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 16:40:37 2013 +0100

    config fix

commit 108e1b6934bc27f62aa1ba7f1c9bf9cc9d9691d3
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 16:03:28 2013 +0100

    update of bb pose

commit a0e75b6b5b3539533d8c7100024d179ce7087c17
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:50:22 2013 +0100

    adjustment

commit 035c0c60900456771a45845c148df7f32594994f
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 15:46:29 2013 +0100

    add reposition if robot to e0man1

commit 8fd0af2944c9147132c8bae4989322cbee5fdbb2
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:29:23 2013 +0100

    Bug fix

commit 679186a11e7027eb15479602f7bf86b8d389f984
Merge: f49d760 a7bfe0a
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:25:18 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit f49d760760350a990242e4f9c944f3ee4d090f28
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:24:53 2013 +0100

    Map loading fixed from launch files

commit a7bfe0ae0895a5679d17c37d910f0e46c1f11184
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 15:20:49 2013 +0100

    adjust robot pos for e0

commit 30c43f1563a2f96e2071c6f9bf834340a380f3eb
Merge: 7f9668b a4bacbb
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:05:08 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 7f9668b6db7eb9d98ee7e55d945ecd56f4cca55c
Merge: ae2209d 7814034
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:04:35 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit a4bacbb6b15fa522ee4ed54fde7019a842791526
Merge: 78f5b6a 7814034
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 15:04:32 2013 +0100

    merge

commit ae2209db148ca0987ad6d372b8a426cab4c69631
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 15:04:17 2013 +0100

    Tunning...

commit 78f5b6a4ecedb7c372b4b07320cec69edfc0d57c
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 15:03:40 2013 +0100

    adjust rviz configs and culling for training

commit 3bfe0df2d25e3889c5331001e6207e7862eea216
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 15:02:57 2013 +0100

    adjust tactile data topic

commit 5153c026c4cd01e2bd94e46a16af49bb1f95ad34
Merge: 089f0e4 7814034
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:49:13 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 7814034f3d4e0dc34387c1597ee6866ddb3c1532
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:48:15 2013 +0100

    Commas changed to dots in RViz configs

commit 089f0e4cfa0448f3a0616fc335523e0bc83e7ecb
Merge: 5838a95 ec2fdd4
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:25:09 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit ec2fdd4bcb18fe64da9e69e2f29c954325fedf83
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:23:38 2013 +0100

    Topics updated in rviz configs

commit 5838a9523d3e8b17ce160713ee13754cc6ddb6e2
Merge: 2fe7f4d f51471a
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:09:44 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 2fe7f4d3e4bf2efd697a4f5a57c82032f1ca2a4a
Merge: e7b647b f2b462a
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:09:28 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit f51471a81267e3973172011235aed4c8be3eb7c8
Merge: ce4fe84 f2b462a
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:06:44 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit ce4fe84c0c50215f1893c9c6ea927a224ee4a2fa
Merge: e4dfb16 7ff58da
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 14:06:25 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit f2b462a520a177a2f64417c75e2ba94e1ef6b2f3
Merge: 670eb11 7ff58da
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Fri Mar 1 02:39:21 2013 -0800

    Merge pull request #110 from srs-user-tests/master

    Another updates

commit 7ff58dadd8668a2e0ae0657c08b1e8a5c37c6fb5
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 09:48:24 2013 +0100

    Bag recording for manipulation tasks.

commit 9281922bfcb6052f3165c9d0059bc5a1aac7ef42
Merge: 670eb11 6cfd679
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Fri Mar 1 09:30:46 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit e7b647b2d5bcda46aa75e064fc7c7b3b44127fed
Merge: 6cfd679 670eb11
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 09:24:54 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 6cfd679bec204d77cb835bdb8a80e3a70758310e
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Fri Mar 1 09:24:23 2013 +0100

    Updated map and logging configuration

commit 670eb11adeaf904d35a4594956b78038827b14ac
Merge: 471d20f f853052
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Thu Feb 28 14:22:54 2013 -0800

    Merge pull request #109 from srs-user-tests/master

    changes from thursday night

commit f853052821dad2d78c4501588d42b5beace8c18a
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 23:21:21 2013 +0100

    add culling for geo map

commit 6fe07df578d7c69c30ed4e053d2b83ac2536397a
Merge: cfe8bf6 471d20f
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 23:12:45 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 471d20ff220146ba2557b6ba9103ab42e417498d
Merge: 93bdf03 9cd45fc
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Thu Feb 28 10:49:06 2013 -0800

    Merge pull request #108 from srs-user-tests/master

    latest changes

commit 9cd45fc3683fcaa96fea5e2308e55025701154ca
Merge: 7e379c3 7526b37
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 19:16:16 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 7e379c394cf584401befc8753dbc68744860a9ce
Merge: 55691d0 93bdf03
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 19:14:51 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 55691d08ab5eefd1806ae476de3ae158b180bcdf
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 19:14:37 2013 +0100

    Bug in the manual octomap clearing fixed (wrong quaternion usage)

commit e4dfb1609a2ddba13753efc296defaa1d11637af
Merge: 7526b37 93bdf03
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 16:25:58 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 7526b37a1271bfb4ee33b3a228fc78293897087f
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 16:25:30 2013 +0100

    Update of configs.

commit cfe8bf6d0ae8132f186f6e84156242f51c5eb2cc
Merge: 2b1209d 93bdf03
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 14:08:51 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 93bdf03e716659d86e8b535d3437d1de1d5cfa88
Merge: b9cc3a6 5bd25dc
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Thu Feb 28 05:08:36 2013 -0800

    Merge pull request #107 from thiagodefreitas/master

    Bag file logger changes

commit 5bd25dcfe539d51d5a003f1309f86878873ebea5
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Thu Feb 28 14:05:01 2013 +0100

    Bag file logger changes

commit c1cbec9305d4263c33fcebfabeed77efb1a4152d
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 13:35:36 2013 +0100

    Update of configs.

commit 5432e3865d49873ba846c209280827fff76235d9
Merge: cfa8708 bafaaf4
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Thu Feb 28 11:43:50 2013 +0000

    Merge remote-tracking branch 'leis/testing'

commit bafaaf44498b746a21e123474bc1dbd83294b501
Author: leis <leishi.mail@gmail.com>
Date:   Thu Feb 28 11:43:02 2013 +0000

    give up to give_up

commit cfa8708adf5949067031802f4fe7b5ad476e9c87
Merge: 88defde 8d8c79b
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Thu Feb 28 11:21:01 2013 +0000

    Merge remote-tracking branch 'leis/testing'

commit 8d8c79b76bdee27f52dfede3cdbc60cf82311acf
Author: leis <leishi.mail@gmail.com>
Date:   Thu Feb 28 11:15:23 2013 +0000

    assisted_detection fixed

commit 2b1209d5bdc8088089367e52f05cba36657c66ad
Merge: 4e98971 b9cc3a6
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 11:32:56 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 4e989718f368aaaa31727c9797f7cddf04890dc7
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Thu Feb 28 11:32:51 2013 +0100

    move interactive teleop to run_localisation

commit b9cc3a680ede6cdf4582180e5f077396681df3c1
Merge: 7c57a68 0402f9c
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Thu Feb 28 01:51:07 2013 -0800

    Merge pull request #106 from srs-user-tests/master

    fix of launch files, update of SN teleop

commit 0402f9c2e9bf96d836f331b9d9d1a015852517d7
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Thu Feb 28 10:33:08 2013 +0100

    SN teleop - limiting of x/th when in unsafe mode

commit 60091465454eb8951caba4f97b73ed198041a23d
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 23:13:54 2013 +0100

    First final map

commit e97125c5a45af967cf5dce0de215cc865e4fd7b4
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Wed Feb 27 19:18:57 2013 +0100

    Typo in launch file

commit c4f728f687f7c2c1ada9a510487375aad811c770
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 19:13:58 2013 +0100

    Tunning of launch files.

commit 7c57a6852e46c69315883d9c1fab34e972eea949
Merge: 4a88f17 1dfcdc3
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Wed Feb 27 08:45:14 2013 -0800

    Merge pull request #105 from srs-user-tests/master

    update of configuration files

commit 1dfcdc34f53c57912465d7507add7ed373ea76e7
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 17:40:53 2013 +0100

    Localization has been separated from run_test.launch.

commit f686d4a0591ffec8cb06056d8482446af40e0205
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 17:40:06 2013 +0100

    Localization has been separated from run_test.launch.

commit 0b1c75a7f7a1a43199f9e46c09720959b30eca4f
Merge: e534598 b885ac9
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 16:42:31 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit e5345988fe9ed349e2de4cbd23b5ccb87d355e79
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 16:06:32 2013 +0100

    RVIZ config update

commit b885ac9f74edfc12eebd433afef9760f3899a29c
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 16:05:23 2013 +0100

    Recover of correct version.

commit 88defde1675d630e1be9c0b488c084792f5e8ed1
Merge: 232eba8 ea4d6d9
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Feb 27 14:17:39 2013 +0000

    Merge remote-tracking branch 'leis/testing'

commit 4a88f178ea30b3378b4f5829b63a32f5d994311f
Merge: 8418f12 d0a2da0
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Wed Feb 27 05:52:28 2013 -0800

    Merge pull request #104 from srs-user-tests/master

    update

commit d0a2da09230984d3fb624f8ecf3c5100a9dc660d
Merge: 7f03b5c 48cf147
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 14:05:55 2013 +0100

    Merge branch 'master' of github.com:srs-user-tests/srs_public

commit 7f03b5c28a7c68258145d52c3128015b23b93674
Merge: 581f327 8418f12
Author: srs-user-tests <fmw@ipa.fraunhofer.de>
Date:   Wed Feb 27 14:04:34 2013 +0100

    merge

commit 48cf1471f413561d5f19d5cb5534bd343e6e72ff
Author: SRS <spanel@srsrobolab2.ipa-apartment.org>
Date:   Wed Feb 27 13:59:45 2013 +0100

    Change in RVIZ config for night task

commit 232eba8a7f0dee65297b24ff88024b4a3f063386
Merge: 92cad1f ad6f30b
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Feb 27 12:56:30 2013 +0000

    Merge remote-tracking branch 'jizecn/master'

commit 8418f12c7c7402a84c135fa9c389f313efded7af
Merge: c726c19 144f9ec
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Wed Feb 27 04:55:31 2013 -0800

    Merge pull request #103 from but-spanel/master

    Recent changes

commit ea4d6d9d1315d2dd54c276a371ba0a8f08fdbc6b
Author: leis <leishi.mail@gmail.com>
Date:   Wed Feb 27 12:48:45 2013 +0000

    bug fixed

commit f0be54a7e745dfc0d053488cf988a3563bcf3a73
Merge: ada3e24 92cad1f
Author: leis <leishi.mail@gmail.com>
Date:   Wed Feb 27 12:38:48 2013 +0000

    Merge remote-tracking branch 'renxi/master' into testing

commit 144f9ec93e7ee04aa1d9436bc8c28ad3325f3575
Merge: ff0edfd 54a6b9e
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Wed Feb 27 13:34:45 2013 +0100

    Merge branch 'master' of github.com:but-spanel/srs_public

commit c726c19c846cb7efc583fb8413201155ebb55fc3
Merge: 3c9335e 54a6b9e
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Wed Feb 27 03:43:09 2013 -0800

    Merge pull request #102 from but-spanel/master

    update on gazebo pc

commit 54a6b9e209fdc36a0ffdb1e3af2fcd1c3ffdf1ae
Merge: 8fe62ab b4c5460
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Wed Feb 27 12:41:57 2013 +0100

    Merge branch 'master' of github.com:but-spanel/srs_public

commit 8fe62ab78de7042ef8afd470802e804d0d497089
Merge: 7b95f6e 3c9335e
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Wed Feb 27 12:39:23 2013 +0100

    merge

commit 7b95f6eff536d18d80cd92389a28096df0335bd8
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Wed Feb 27 12:39:02 2013 +0100

    make executable

commit 92cad1fbf29376667d38d1d10f91ccd1ff28c6f2
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Wed Feb 27 11:24:20 2013 +0000

    rm paste error

commit ff0edfd900814a18eccba30f226077cbc1319515
Merge: b4c5460 3c9335e
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Wed Feb 27 12:20:22 2013 +0100

    merge

commit 581f327543583a1c41e5adbeff1ad9105a142051
Merge: 0178bf6 b4c5460
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Wed Feb 27 12:12:24 2013 +0100

    Merge https://github.com/but-spanel/srs_public

commit b4c5460132af82041b07e837467bdf3330d64e49
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Wed Feb 27 12:11:43 2013 +0100

    Env. model raycasting disabled for manipulation.

commit 0178bf6d32441c0e4ef62838b390f7e897af16a6
Merge: a7d1a03 3036eb9
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Wed Feb 27 11:51:30 2013 +0100

    Merge https://github.com/but-spanel/srs_public

commit 3036eb99b0032966daf8ac172b390f08e1cf4eaa
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Wed Feb 27 11:50:55 2013 +0100

    Added service call for setting arm stiffness

commit a7d1a035a679d56d81ee14f6e5e8cf467eaf77a8
Merge: 622d371 8d40725
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Wed Feb 27 09:49:10 2013 +0100

    exp

commit 8d40725f7f8b617685c9ce08794af7df96df5d55
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 23:16:08 2013 +0100

    Robot env. model config updated to the latest version

commit 64e6cfdf1b8beca9f3bf2c4ed227f66a6a0eb69c
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 22:44:26 2013 +0100

    Update of remote monitor.

commit 7fbf06a95ee1d09ce8eea2298fe99729b1cce958
Merge: 64e86a3 ebb67bc
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Tue Feb 26 22:07:01 2013 +0100

    Merge branch 'master' of github.com:but-spanel/srs_public

commit ebb67bc9aefbefaa264c510c6ddb38d5f8451d55
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 21:24:24 2013 +0100

    Provisory fix of the env. model (using /head_cam3d_link instead of /map)

commit 112baf6d942ecfff86116e45cf96eb6f45c827d5
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 19:22:33 2013 +0100

    Fix of wrong perspective after start.

commit a8189f4359b12ebe1d63b9668e8dc0c5206be24d
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 18:29:56 2013 +0100

    Removed some mistake in directory structure.

commit 1bc56173cd21ecc0cc02b9a05250bbdf20f4cda3
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 18:18:18 2013 +0100

    Added possibility to have different pre-recorded maps for different tasks.

commit 622d3718f9e85ab9b6fdd7d82f3e2c8bc061a73e
Merge: 905122a 9554c7a
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Tue Feb 26 16:28:31 2013 +0100

    Merge https://github.com/but-spanel/srs_public

commit 9554c7a479a6679586e64a4c36514f7a1d054e67
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 15:51:34 2013 +0100

    Update of assisted arm manip and cob SN teleop.

commit 3c9335e37e4ea8805f167e92a781705c2ca1ad2f
Merge: 905122a d3e1c72
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Tue Feb 26 06:43:13 2013 -0800

    Merge pull request #101 from thiagodefreitas/master

    Shell script

commit d3e1c725afdb375133af69aa3e9ab125000a4bf5
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Tue Feb 26 14:46:13 2013 +0100

    Added rate sleep to the ROS loop

commit 615d062a46981105f35a1e4cc5accd28ffedc9aa
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Tue Feb 26 14:27:01 2013 +0100

    License

commit db2b0b4f677b14fe2fb61303d553061e6b350787
Merge: 6ca96b7 905122a
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Tue Feb 26 14:23:14 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 6ca96b73d2d6dfc4dae94c045c3027b046a59877
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Tue Feb 26 14:22:05 2013 +0100

    Shell script
    * Minimal configuration rviz
    * ROS time display
    * Bag file logging trigger

commit 6f4247f116622aabc1e9dcae2d40ebe697b14fd1
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 14:11:34 2013 +0100

    Issue with logging

commit 905122ae956a61dc96c2061a337d4b8821492c78
Merge: 9c0a637 7514524
Author: srs <srs@cob3-3-pc1.(none)>
Date:   Tue Feb 26 12:06:00 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 9c0a637d4705fd21a185ec891283e47b7e8cf039
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Tue Feb 26 12:05:08 2013 +0100

    Change in tactile data topic.

commit 11c3f80023fcd33dd87c2a8e7bec4355c1fe9e39
Merge: 5244fb5 42edfdd
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Tue Feb 26 11:36:00 2013 +0100

    Merge https://github.com/but-spanel/srs_public

commit 42edfdd73e3224f2b47f5d9e29c1b93491b76cc7
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 11:34:31 2013 +0100

    Tunning of launch/config files.

commit 5244fb570189d8e85c3a5cca339e08c50994ef6e
Merge: 1f65441 ea63fc0
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Tue Feb 26 11:15:14 2013 +0100

    Merge https://github.com/but-spanel/srs_public

commit ea63fc00991213c8ee732818df2258502c04e21d
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 11:07:29 2013 +0100

    Some files remove, bb monitor added.

commit 2891a8696ef37693cee6a233023a1f7ac0143e07
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 11:05:48 2013 +0100

    Some files remove, bb monitor added.

commit 36a81aa9b0d37a947f554ebefbde3135a9e4c13f
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 26 09:47:01 2013 +0100

    Bugs in unknown object scaling using IMs fixed

commit 751452410a793f0bd6336ea1c769c4fbcc0a5892
Merge: a97814d b43d5cd
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Mon Feb 25 23:31:38 2013 -0800

    Merge pull request #100 from thiagodefreitas/master

    Stops recording triggered topics and checks if directory exists

commit b43d5cdbb92e3a1dc366655e28ea41d6d9c8a738
Merge: e78d6e5 a97814d
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 21:00:29 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit e78d6e50f157a0fcb67b7ad3378f398b16f713cb
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 20:59:14 2013 +0100

    Creates the directory if that does not exist
    * Stops recording the continuous triggered topics

commit b5764d393158e994a6a8f878eebb545c0e0c06e0
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 20:22:43 2013 +0100

    Creating directory if that does not exist

commit 1f6544166e767331588820be51b597d9e26f1fea
Merge: 1c73b01 a97814d
Author: srs <srs@cob3-3-pc3.(none)>
Date:   Mon Feb 25 20:04:13 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit a97814da4e2bf6a7e84285c4a2736c370ad3d8c4
Merge: 73d4e84 5f7c2c2
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Mon Feb 25 11:04:00 2013 -0800

    Merge pull request #99 from thiagodefreitas/5f7c2c2950103bf6541d6fc3f5dbf0d27f592020

    Removed srs_user_tests services

commit 64e86a379d71dfb6db23576fadae5a5b65de789f
Merge: b39f65b 1c73b01
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Mon Feb 25 18:16:56 2013 +0100

    Merge branch 'master' of github.com:but-spanel/srs_public

commit 1c73b0196cdf93ef20979ac364c2439ae39adb05
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Mon Feb 25 18:16:15 2013 +0100

    Update made at IPA

commit b39f65b9f71fd50632b128f5944519e96f3e7b9c
Merge: 64778ea 0ee7995
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Mon Feb 25 18:14:29 2013 +0100

    Merge branch 'master' of github.com:but-spanel/srs_public

commit 0ee7995cc1ab279dc719c448254d488a3adcb241
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Mon Feb 25 18:09:21 2013 +0100

    Update made at IPA

commit 80c3b874329262886367198580ad72f37a7dfa75
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Mon Feb 25 18:08:31 2013 +0100

    Update made at IPA

commit df41c4fbfe7ec0d3e4f64e68cd9769c5ddfb7e15
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Mon Feb 25 18:03:49 2013 +0100

    Changes made at IPA on Monday

commit c6bbe32f790bb6ebef8ac9714e4e9ae9a14c9b13
Merge: 8776e03 73d4e84
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Mon Feb 25 18:01:20 2013 +0100

    Merge remote-tracking branch 'origin-ipa320/master' into automerge

commit 64778ea16b7fb323760d51ae79e775182875cf7b
Merge: 8776e03 73d4e84
Author: SRS <hdmsrs@srsrobolab.iuk.hdm-stuttgart.de>
Date:   Mon Feb 25 17:52:45 2013 +0100

    Merge git://github.com/ipa-fmw/srs_public

commit ada3e245a5b530769fb45950eec4bad7497dec47
Author: leis <leishi.mail@gmail.com>
Date:   Mon Feb 25 16:35:25 2013 +0000

    assisted_detction works

commit d0f60d3b64b1de52dea71528492691d9b363ae12
Merge: 5f7c2c2 73d4e84
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 17:20:03 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 73d4e84b5d883535f039f046f519edd2ad4e7c70
Merge: aa796c0 320356a
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Mon Feb 25 08:19:28 2013 -0800

    Merge pull request #98 from ipa-fmw/master

    add move_robot script for real robot

commit 5f7c2c2950103bf6541d6fc3f5dbf0d27f592020
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 17:19:19 2013 +0100

    Removed srs_user_tests services

commit 320356abba5d3aad9cc0b0aaaa4d0cf4d3429be5
Author: ipa-fmw <florian.weisshardt@ipa.fhg.de>
Date:   Mon Feb 25 17:18:40 2013 +0100

    add move_robot script for real robot

commit aa796c044160d9b48ec5cd1c31e0f49f7028ac85
Merge: 4e796e2 cb54206
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Mon Feb 25 08:17:46 2013 -0800

    Merge pull request #95 from thiagodefreitas/master

    Commit was missing global lock

commit cb542064ef8b77547f3e60f8f48f639996a1aa34
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 17:15:24 2013 +0100

    Bagfile recording control

commit 8776e03a434f083093206c14238e5b4bea320577
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Mon Feb 25 16:42:23 2013 +0100

    Training and some small helper scripts added.

commit 96c8e6bfa97460bd012f8de5d024c37f49994128
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Feb 25 15:31:32 2013 +0000

    return object id on assisted detection

commit 3094a4f8dc77066603f73bdc1a91177d0ba1f135
Merge: df010c4 d5080cb
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Feb 25 14:40:19 2013 +0000

    Merge branch 'master', remote-tracking branch 'origin'

commit df010c4f935b6b5280e79ad8b0e8116176e5af10
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Feb 25 14:39:35 2013 +0000

    tidy up with lei

commit 032a2d2d64921e7810758969d9ec2cb2038d6e8f
Merge: 75319a6 23b0de9
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Feb 25 14:38:17 2013 +0000

    Merge remote-tracking branch 'leis/testing'

commit d5080cbb7adf9f4790b3f4a087a86e3593fe9307
Merge: 75319a6 23b0de9
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Feb 25 10:01:15 2013 +0000

    Merge remote-tracking branch 'leis/testing'

commit 75319a6392683df5c4a17dd57be41ade60dfd58e
Merge: d3e114a 4e796e2
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Mon Feb 25 09:23:52 2013 +0000

    Merge remote-tracking branch 'origin-ipa320/master'

commit cabf9e4666e722b4bf7b1cc0da5b9eddc661d29f
Merge: 799b0f0 4e796e2
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Mon Feb 25 09:47:22 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 4e796e2bcd6d8de2b7e913c92062bf353459fa1a
Merge: 7e08804 e9ae351
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Mon Feb 25 00:40:54 2013 -0800

    Merge pull request #97 from but-spanel/master

    Latest changes...

commit e9ae3518430c632498664cd86db99cbc775278b2
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Fri Feb 22 18:05:42 2013 +0100

    OBB overlap estimation

commit ff508e6bafb2e5e347a4bcbb264b64780bebcd10
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Fri Feb 22 18:04:26 2013 +0100

    Unknown object sizing using IMs fixed

commit 91156ee0285d223d09f2800db60dc7fd4c7e44fd
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Thu Feb 21 16:27:59 2013 +0100

    Octomap plugin (i.e. manual voxel map changes) fixed; New service to turn off voxel map coloring

commit 23b0de913aceaae1a6613917ff0be0521b7f6a29
Author: leis <leishi.mail@gmail.com>
Date:   Thu Feb 21 10:19:57 2013 +0000

    bug fixed

commit 933bc5e5fc05e5c659543d8e16a18fc85a02d8a3
Merge: 32b71bf 7e08804
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Wed Feb 20 19:05:20 2013 +0100

    Merge remote-tracking branch 'origin-ipa320/master' into automerge

commit 32b71bf69c9a995875b279db5863eeca3ffbb926
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Wed Feb 20 19:04:15 2013 +0100

    Small step forward final launch files for user tests

commit ad6f30bd0feef2eef8fa82ecae14c8c60d6223f3
Author: jizecn <jizecn@gmail.com>
Date:   Wed Feb 20 10:13:31 2013 +0000

    PlanNextAction.srv updated with constant values

commit 37df218bb8bedeb79592fd985cfdd11eedce65af
Author: leis <leishi.mail@gmail.com>
Date:   Tue Feb 19 19:54:28 2013 +0000

    bug fix

commit bfe0e90e5a5cb1b2bb07cfea0d79c489e5d46fab
Author: leis <leishi.mail@gmail.com>
Date:   Tue Feb 19 19:11:18 2013 +0000

    user intervention fixed

commit 10854b7396d460d85d6e519f28b039e0bd8725df
Author: leis <leishi.mail@gmail.com>
Date:   Tue Feb 19 19:08:57 2013 +0000

    user intervention fixed

commit 799b0f0bc268ed6d3da5184749eb4d26391d2733
Merge: 3dd43c2 202b052
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Tue Feb 19 13:16:54 2013 +0100

    Merge branch 'master' of github.com:thiagodefreitas/srs_public

commit 3dd43c2160f48873d27b202e0def473aa26f0537
Merge: fccba81 7e08804
Author: Thiago de Freitas <thiagodefreitas@gmail.com>
Date:   Tue Feb 19 13:16:35 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 202b052ae149aca1e064024eb93a4f0fbae7a4e7
Merge: fccba81 7e08804
Author: thiagodefreitas@gmail.com <thiagodefreitas@gmail.com>
Date:   Tue Feb 19 13:07:26 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit 7e0880489ac8f7c94e5ac86dae4abcb9d2a16b5d
Merge: 4284f49 7927b2d
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Tue Feb 19 03:59:46 2013 -0800

    Merge pull request #96 from but-spanel/master

    Recent preparations for the user tests

commit 7927b2d6a685d80355a6b07bcc408be176dc92d4
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 19 12:55:01 2013 +0100

    Launch files preparation for user tests

commit 9ebe3ba87f24eddd6e28ea9211ed0139906826e0
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 19 12:43:29 2013 +0100

    Latest modifications of the assisted arm navi for user tests

commit 7e021a05f9b0e25cb7fd7c3aefbecd8c45e908d9
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 19 12:42:43 2013 +0100

    Unknown object scaling fix; wireframe model added

commit 5c7b4ac58a79e64cf8f9350aed82dca7c7849952
Author: leis <leishi.mail@gmail.com>
Date:   Tue Feb 19 11:38:28 2013 +0000

    some changes

commit d3e114ada5ea3bda97d8a4c8d176f026f4d37aa2
Merge: 2c190a8 4284f49
Author: renxi-cu <qiur@cf.ac.uk>
Date:   Tue Feb 19 10:48:01 2013 +0000

    Merge remote-tracking branch 'origin-ipa320/master'

commit fccba815ff4cfe2acb1a90f9b7f2fccf40f14300
Merge: c29f08a 4284f49
Author: thiagodefreitas@gmail.com <thiagodefreitas@gmail.com>
Date:   Mon Feb 18 14:01:40 2013 +0100

    Merge branch 'master' of github.com:ipa320/srs_public

commit c29f08adf6aa4ea85b402a34a1aecc6355d54d55
Author: thiagodefreitas@gmail.com <thiagodefreitas@gmail.com>
Date:   Mon Feb 18 14:01:13 2013 +0100

    Global lock

commit 4284f4987b99b15f79cd64eff8e9b3a17966a320
Merge: e1b3c49 c3db389
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Mon Feb 18 13:26:01 2013 +0100

    merge

commit e1b3c49ef065a04d5d0a0a799dc52e15d9bff8d5
Author: srs <srs@cob3-3-pc2.(none)>
Date:   Mon Feb 18 13:23:34 2013 +0100

    add rviz camera position to bag logger

commit c3db389dcb773197ebdfcd31264415f8383f2a93
Merge: 7a2cd29 9e82042
Author: Florian Weißhardt <florian.weisshardt@ipa.fraunhofer.de>
Date:   Wed Feb 13 09:10:52 2013 -0800

    Merge pull request #94 from but-spanel/master

    Recent changes of BUT packages...

commit 9e820420c5442f7b1d7f1765c0c55462cdc7ca12
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 12 18:17:50 2013 +0100

    Added service call to set default visibility of BB's interactive markers

commit a2492ec30e57dfe687425787f4c46209cef8af3f
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 12 18:15:34 2013 +0100

    BB placement training updated

commit c26fa88510d3c730f5b7dad4e93781e51f6f0fda
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 12 18:14:55 2013 +0100

    Black image publisher added

commit d83e74eac232af1c34a88f78c018d0c01e0859b7
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 12 18:12:46 2013 +0100

    Added service to change visibility of IMs for unknown objects

commit 0cc2328e621fa059ebae444877fc527f5c510d34
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Tue Feb 12 12:14:49 2013 +0100

    Recent changes in BUT packages

commit 0f00ec03b70811a3a2f191d97e6bd43f68dd3946
Merge: 4353fbb 7a2cd29
Author: jizecn <jizecn@gmail.com>
Date:   Wed Feb 6 10:32:31 2013 +0000

    Merge remote-tracking branch 'ipa320/master'

commit 4353fbb4364bee73ece4c766592f50cb0c74977e
Merge: 54300c7 a362bed
Author: jizecn <jizecn@gmail.com>
Date:   Fri Feb 1 10:15:44 2013 +0000

    Merge remote-tracking branch 'renxi/master'

commit 50d8762945381fcc615ae20afa001ad53fafe591
Author: but-spanel <spanel@fit.vutbr.cz>
Date:   Thu Jan 31 16:32:22 2013 +0100

    Latest changes for the Gazebo study

commit 54300c735ae44c17113a11340f5414894c5d1b34
Merge: cbbf8fc 4d49117
Author: jizecn <jizecn@gmail.com>
Date:   Wed Jan 30 12:06:51 2013 +0000

    Merge remote-tracking branch 'ipa320/master'

commit cbbf8fc1ddca14a5db25830ece55f55a219632ef
Merge: 8547adb c1efee8
Author: jizecn <jizecn@gmail.com>
Date:   Tue Dec 18 11:27:23 2012 +0000

    Merge remote-tracking branch 'ipa320/master'

commit 8547adbb58bbf7d33f09ed28390c2b3361a7447e
Merge: ea0bd0d b08d065
Author: jizecn <jizecn@gmail.com>
Date:   Thu Nov 22 11:30:09 2012 +0000

    Merge remote-tracking branch 'ipa320/master'

commit ea0bd0d6f52ca9966533933b0a67e9c077f5e400
Author: jizecn <jizecn@gmail.com>
Date:   Wed Nov 21 17:27:46 2012 +0000

    mmm

commit 262b674995dba19319cd3d46d2718124aa90cf1e
Author: jizecn <jizecn@gmail.com>
Date:   Wed Nov 21 17:22:57 2012 +0000

    getobject on map jsonProperties added for object categories info

commit 3e9d3ae9a1144ebb938836d9bd1494852e1a5e7c
Author: jizecn <jizecn@gmail.com>
Date:   Tue Nov 20 18:09:06 2012 +0000

    ipa-apartment owl added. not fully tested yet

commit 7548b0b8cdb8ad76193b00075994a26151cebe79
Author: jizecn <jizecn@gmail.com>
Date:   Tue Nov 20 18:08:23 2012 +0000

    changes to handle empty scan positions from grounding, and some fixes with get object task etc