Merge branch 'master' of https://github.com/padrig64/MultitouchFramework

Conflicts:
	TODO.md