Category and custom field assosiations
Merge branch 'field-associations' into develop
Delete association test

- We trust that Rails does it's job