Reorder the navbar links
Merge branch 'master' into falcon

Conflicts:
	index.html