To include computing content category
Content filter
Merge branch 'hotfix/cont_filter' into develop

Conflicts:
	script/mobility.js