changed category to separate entity fixing AGPUSH-999
migration script
making test compile
Merge branch 'category-refactor' into 1.0.x