Added touch support.
Merge branch 'master' of github.com:cgiffard/GAAD-Talk-2013
Added touch support.