Merge pull request #2 from atmmarketing/master

fix tab deep-linking
5.3.6
Merge pull request #3 from atmmarketing/development

5.3.6