Isotope Content cards, view, edit options enabled.
Merge remote-tracking branch 'origin/master'

Conflicts:
	UI/categoriesandcontent/html/controlpanel.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	UI/categoriesandcontent/html/controlpanel.html