Change to random category selection.
Merge branch 'random-categories' into develop