front
Merge branch 'master' of https://github.com/nickyudha/ayujewellery-new

Conflicts:
	static/nav.php