[FIX] Nav
delete index.html
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	index.php