PROJ-91 model updates
Merge branch 'develop' of github.com:Inovitex/fcms into develop

Conflicts:
	app/models/category.rb
	app/models/composer.rb