Merge pull request #29 from raphaelm/master

Update with latest commits from raphaelm
Add Aachen RWTH and adapt the TouchPoint implementation to it
Merge pull request #257 from johan12345/master

Add: Aachen RWTH