Snippet nav
Merge branch 'master' of https://github.com/mvdandrieux/grandcentral

Conflicts:
	grandcentral/content/template/master/snippet/nav.snippet.php