WIKI-234 Activity types for Wiki page
Merge remote-tracking branch 'origin/master' into feature/activity-type