fixed few minor conflict leftovers
Merge branch 'release-1' of github.com:festivit/festivit into release-1
Merge pull request #30 from obeid/release-1

fixed few more minor merge conflict leftovers