proper reaction to setting preferences
Merge branch 'master' of https://github.com/Podlas29/Touch1.2

Conflicts:
	TODO