pulling from github
Merge branch 'event-model' of github.com:daniilsunyaev/events_calendar into event-model
minor tests modifications