update with voting
Merge branch 'dev'
Merge branch 'dev' into staging
fixed conflicts
fixed conflicts
Merge branch 'staging'
latest styles
merge conflicts corrected
styles