Fix nested form associate
Fix controller name
Merge branch 'master' into improvements