fix something
Merge branch 'master' of github.com:isfit/events