license
added some tests (starting to...)
removed rails_admin plugin in favor of the gem
modified the readme with version information
Merge branch 'master' into public
resolved conflict
Merge branch 'master' into public