Merge branch 'develop'
Merge branch 'develop'
fix for iScroll: wrong vendor detect on HTC One S
Merge branch 'master' into develop