changed nav menu
Merge branch 'release-1' of github.com:festivit/festivit into release-1
Merge pull request #70 from obeid/release-1

fixed nav menu
fix notice merge conflict