fixed merge conflict
fixed more merge confs
removed login from body of application
Merge pull request #48 from dazm12/release-1

Clickthrough Changes
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
added group_name to seed data
completed all the questions for forms
Merge pull request #50 from rscottbradshaw/applications

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

Questionaire
Add feature spec folder
Merge remote-tracking branch 'upstream/release-1' into release-1
Add some specs