Merge proposals dependent on lp://qastaging/~ucl-cs-study-devs/activityfinder/ucl-study-journal

1. ucl-study-journal
2. Dependent merge proposals