Improved navigation
Merge branch 'master' of https://github.com/trendwerk/trendpress-child

Conflicts:
	header.php