Merge pull request #30 from obeid/release-1

fixed few more minor merge conflict leftovers
cleared the contents of index.html.slim to avoid duplication
Merge branch 'release-1' of github.com:festivit/festivit into release-1