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

Conflicts:
	script/mobility.js
1) Lost the alphapetical ordering
2) The curve edge is now with the last but the previous one item. This is due to the new item introduced.

1 and 2 fixed
1) Lost the alphapetical ordering
2) The curve edge is now with the last but the previous one item. This is due to the new item introduced.
1 & 2 fixed