fix transition form map mode to slide mode
Merge branch 'master' into gh-pages