do not define ActiveRecord as a class #1084
Merge pull request #1085 from hooopo/patch-1

do not define ActiveRecord as a class #1084
Merge remote-tracking branch 'upstream/master' into super-admin