Add activity content type and view
Merge branch '445' into develop