fixed users_controller tests. Still pending corrections on global_controller
added another company and normal users to seeds.db
Corrections from catalan translators
Merge pull request #93 from coopdevs/fix_users_tests

fixed users_controller tests. Still pending corrections on global_contro...
Merge pull request #94 from coopdevs/seeds_enhanced

added another company and normal users to seeds.db
Merge pull request #95 from coopdevs/translators_fixes

Corrections from catalan translators
Merge remote-tracking branch 'origin/master' into localized_static_pages

* origin/master:
  Corrections from catalan translators
  added another company and normal users to seeds.db
  fixed users_controller tests. Still pending corrections on global_controller

Conflicts:
	spec/controllers/global_controller_spec.rb