Update _nav_menu.html.erb
Merge pull request #1 from dsatch/Dean

Update _nav_menu.html.erb
Deploy from nzffa repo i.o. dsatch repo
Use page_reader_group_permissions from nzffa i.o. enspiral
Tell bundler about the conference extension
Merge branch 'conference' into staging