arreglando unas cositas
creo que funciona, mejorando el manejo de cookies, casi listo

Merge github.com:No6things/ATICOMPANY

Conflicts:
	source/hermes/app/controllers/general_controller.rb
	source/hermes/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	source/hermes/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	source/spa/app/assets/javascripts/spa.js
	source/spa/app/views/home/index.html.erb