Use explicit :en locale for rails_admin
Add paper_trail to rails_admin
Merge branch 'master' of github.com:jmuheim/base

Conflicts:
	db/schema.rb
schema.rb