More Nav-Bar improvement
Merge remote-tracking branch 'origin/master'

Conflicts:
	pages/upload.html