'model group' and 'model' in 'software' tab (fix)

Columns 'Model Group' and 'Model' should not be shown in 'Software' tab (only 'Label' and 'Version' are needed there).

(+ fixed a typo in catalog.py.)