Merge branch 'hotfix-omniauth'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Extracted vote callbacks and controller logic into Voter service object
Merge branches 'master' and 'develop' into develop