Merge branch 'master' of https://github.com/diegozavala/integracion

Conflicts:
	app/helpers/application_helper.rb
a