local changes
Merge branch 'Paul' of https://github.com/honky/SoftwareProjektTUBAF2013 into Paul
miepmiep