Merge pull request #34 from PhilippSteiner/wolfgang

Wolfgang
sdfsfsf
Merge branch 'Alex'
login incl role management