Provide correct integration from front-page and I18n.

That is, just set the local and redirect back to where
you were.
No need for all thse hard-coded rediects
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
Merge pull request #91 from coopdevs/localized_static_pages

Localized static pages
Added email validation format for user and related test. Relax format to allow dummy @example.com but at least having at signa and domain
improving language chooser, closes #92
fake user email is created if blank email is provided. Fixed regex to make sure a valid email address is entered. User creation errors are properly showing in view
added spec/models/user_spec.rb
Merge pull request #98 from coopdevs/user_email_validation

Added email validation format for user and related test. Fixed validation errors when creating users to provide i18n feedback.
run Travis against Ruby 2.1
run migrations before tests
Error shown now when trying to create a new user with an existing email address
Merge pull request #100 from coopdevs/error_if_email_reused

Error shown now when trying to create a new user with an existing email
renamed devise email .cat.html.erb files as .ca.html.erb instead
Merge pull request #101 from coopdevs/wrong_email_body_for_cat

renamed devise email .cat.html.erb files as .ca.html.erb instead
Merge branch 'master' into lang_chooser

Conflicts:
	app/helpers/application_helper.rb
little code review; make hound ci happy
Merge branch 'master' into fix_ci
include swaps without tags in stats
Added Vagrant support

fixed problems in seeds, added rubocop and haml-lint in dev area and finish corrections in bootstrap.sh script