add edgeSwipe3
Merge branch 'master' into edgeSwipe
update for edgeSwipe3
fixed parameter
Merge remote-tracking branch 'origin/master'