#67 token first approach
Merge branch 'master' of github.com:IvenZ/htwplus