Ported Ken's changes ( Smart nav - 4ab2583475902c31663932e8a5ec17cf6dc70ea8 )
Merge branch 'refactor2' of https://github.com/volusion-angular-themes/method into refactor2

Conflicts:
	dist/index.html