Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fix for iScroll: stop animation on tap