main navigation
Merge branch 'master' of https://github.com/Raysmond/FDUGroup

Conflicts:
	public/css/theme.css