attempts to fix slider swipe conflict
Merge branch 'master' of github.com:toddzebert/ceamodev