post merge fix
custom sprint tabs
Merge branch 'master' of github.com:stxnext/intranet