Subiendo funcionalidad de panel administrativo
Merge cambios de general.js-index-routes

Conflicts:
	source/hermes/app/assets/javascripts/general.js
	source/hermes/app/views/home/index.html.erb
	source/hermes/config/routes.rb