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
resolve merge conflicts