Merge branch 'master' into dev
Prototyping better swipe
Improved touch swipe for carousels
Fixed falsy bug
Merge branch 'dev'