Subforum subscription settings on settings page
Merge branch 'master' into subforum-subscription-settings

Conflicts:
	app/assets/javascripts/client-prod.js
	client/src/community/components/settings.cljs
Merge branch 'master' into subforum-subscription-settings
Minor style change for subforum group
Concise user json builder
Merged upstream master