Merge pull request #1 from 01org/2.1devtf

Get latest
Merge pull request #2 from 01org/2.1devtf

update to latest scroll fix
Fixed 'undefined' error in touchLayer when running on desktop.
no-scroll class didn't remove js-scrolling - merged the two if statements.
Merge pull request #552 from madebysoren/2.1devtf

touchLayer and no-class scrolling fix for desktop