Merge branch 'hotfix/fix_underscore_class_name'
Fixed and model form permission is 'Association' and not on permissions Hash.
Merge branch 'hotfix/fix_underscore_class_name_2' into develop