Merge branch 'master' of github.com:profmaad/activeadmin-mongoid

Conflicts:
	lib/active_admin/mongoid/resource.rb

Author: profmaad