Select categories for social
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/system/zo2/assets/js/adminsocial.js