railsadmin, devise, some tables
Merge branch 'jerome'

Conflicts:
	Gemfile.lock
	db/schema.rb