Desperate try to fix the error :/
Merge branch 'master' of https://github.com/eventplaner/eventplaner