Merge branch 'refs/heads/develop'
evaluate short code inside of 'voting' shortcode
Merge branch 'refs/heads/master' into develop