Converted touch handlers to gesture recognizers
Merging updated files
Merge branch 'gesture-recognizers'