Moved activeTabs config to configuration stage
Merge branch 'master' into gh-pages