all changes for sprint 5
Merge branch 'master' of github.com:da-owl/swp-ucd-2013-eule