alguna porqueria qe tu quieras
Merge branch 'development' of https://github.com/sbianchi/wira into development

Conflicts:
	app/controllers/registration_requests_controller.rb

	modified:   app/controllers/establishments_controller.rb
	modified:   app/controllers/invitations_controller.rb
	modified:   app/controllers/registration_requests_controller.rb
	modified:   app/controllers/sessions_controller.rb
	modified:   app/helpers/users_helper.rb
	modified:   app/models/establishment.rb
	modified:   app/models/role_type.rb
	modified:   app/models/user.rb
	modified:   app/models/user_establishment.rb
	modified:   app/views/establishments/index.html.erb
	modified:   app/views/establishments/index_admin.html.erb
	modified:   app/views/invitations/list_roles.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/sessions/home.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20131013200607_add_user_id_to_user_establishment.rb
	modified:   db/schema.rb
Merge branch 'development' of https://github.com/sbianchi/wira into development