barnching fix
Merge branch 'master' of github.com:Sterbic/Projekt-2012