squash commit: fb_100

Squashed commit of the following:

commit c22dfb55d747df36713ad14c786d767c33678de4
Merge: fe73cf3 17f4dd8
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Wed May 8 15:21:25 2013 +0200

    Merge branch 'master' into fb_100

commit fe73cf38026e517e6b262da3ee7f7d5e758260d6
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Mon May 6 16:30:06 2013 +0200

    more

commit b1d02c5b372bc12cc0e4cd35156a0d2bffe47b16
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Mon May 6 15:55:33 2013 +0200

    configs