wir wollen das hier zusammen

commit 8ac8a4d10364a7acda93a785944aeb3746c8dc14
Author: Tobias <tobias.k.schmidt@gmail.com>
Date:   Tue Jul 22 16:23:31 2014 +0200

    hot22dddddd2ddd2dadsadasdd

commit 553c38f685e65de1bf8ce58501e963fc3334c30c
Author: Tobias <tobias.k.schmidt@gmail.com>
Date:   Tue Jul 22 16:23:22 2014 +0200

    hot22dddddd2ddd2dd
hier passier was
Merge branch 'hotfix/gefhar' into develop
Merge commit '6e99c288072a5c3b655c56885055f71219752527' into feature/hotworks
hh
Merge branch 'feature/hotworks' into develop
Merge branch 'release/v.0.3'