fixed associatiosn
Merge branch 'master' into dev  - should have been a hotfix
AMCAT-30 #resolved remove code label
Merge branch 'hotfix_save_code_label' into dev
Merge branch 'dev' into feature_ui_overhaul