Making frontend correspond to changed backend
Merge remote-tracking branch 'training-git/master'
Fixed displaying categories