Fixed association parameters to not collide with cancan
Merge branch 'master' into orders