more fixes
Merge branch 'rails4' of github.com:amco/acl9 into rails4