fixed merge conflict
fixed more merge confs
removed login from body of application
Merge branch 'release-1' of github.com:festivit/festivit into release-1
fixed top bar links alignment issue and overlap issue
Merge pull request #49 from obeid/release-1

fixed top bar menu alignment issue and overlap
Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire
Merge pull request #50 from rscottbradshaw/applications

added group_name to seed data
Merge pull request #51 from rscottbradshaw/questionaire

Questionaire
Merge branch 'release-1' of https://github.com/festivit/festivit into questionaire