fix variable name in nav
Merge branch 'mporam' into develop

Conflicts:
	demo/css/nav.less
Merge branch 'develop' into hannahg