Fixed blocking one's own touches. Mash away nobos.
Merge branch 'feature/Lars' into develop
Merge branch 'develop' into feature/Danny_1