added the touch stuff
Merge branch 'refactor-forum'