Base

Base
compañías y usuarios base
schema
admins base and i18n
fix a en.yml
default language is Spanish xD
Merge branch 'master' of github.com:manuelbg/adoptame

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/companies_controller.rb
	app/helpers/application_helper.rb
	app/views/companies/index.html.erb
	app/views/layouts/application.html.erb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb