changes to navigations
Merge branch 'master' of https://github.com/stewartSG/Muka into stewartSG-master

Conflicts:
	public/innerpage/products.html