Small fixes
Merge branch 'master' of https://github.com/Laastine/event-app