Fix the association for the Rails admin
cleaning up json input
Merge branch 'master' into dev