Merge branch 'omniauth' into feature/event_list