basic rails admin install
Merge branch 'rails_admin'

Conflicts:
	config/application.rb