R18n chaos
wqMerge branch 'master' of https://github.com/aburone/titi

Conflicts:
	Gemfile
	app_controller.rb
	fea/support/env.rb
	features/login.feature
	locales/es.yml
	models/bulk.rb
	test/test_bulk.rb