activeadmin working properly for users, problem with the others models because of has_many, through association
conflict was minor, is solved
Merge pull request #8 from ManyBaby/setup-activeadmin

activeadmin working properly for users, problem with the others models b...
removed conflicts