CRM-13184 - Code Merge
CRM-13184 - Moved resetNavigation down
Merge pull request #93 from vivekarora/CRM-13184-Fixed

CRM-13184 - Code Merge