Completed Task 3 and 4
Merge branch 'dev' of https://github.com/zugort/SS2014-Uni-Bonn into dev