squash commit: fb_100

Squashed commit of the following:

commit 6558e38c4fe95fa3498a1c42558917597ff0993e
Merge: b28ad02 43706c3
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Wed May 8 15:20:56 2013 +0200

    Merge branch 'master' into fb_100

commit b28ad02bdeec2837f53beaf95bad53e35cb3c620
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Mon May 6 18:18:53 2013 +0200

    more

commit 4408d3872b995accf83a9183af91c8f6c4a39205
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Mon May 6 17:39:40 2013 +0200

    rounding numbers

commit 408df32b1c7bd33b592a7f7c70617c249e388174
Author: Andor Goetzendorff <goetzend@cs.tum.edu>
Date:   Mon May 6 12:06:33 2013 +0200

    tests