Merge branch 'Adar'
side by side: add separator lines
side by side: category and socio
side by side: category and socio locale
side by side: min max
Merge branch 'master' into Adar