fix recursive doNav on collapse event
fix bad merge
Merge branch 'master' of github.com:thnkloud9/theme-StoryTeller