Make activeadmin-mongoid play nice with ActiveRecord resources
Merge branch 'master' of github.com:profmaad/activeadmin-mongoid

Conflicts:
	lib/active_admin/mongoid/resource.rb
Make activeadmin-mongoid 0.3.0 play nice with regular activerecord activeadmin resources
Merge pull request #30 from profmaad/master

Make activeadmin-mongoid play nice with ActiveRecord Resources