update 15-11
Merge branch 'master' of https://github.com/Rotrer-Inc/maule-tsc

Conflicts:
	app/KCC/cgi-bin/datos/tbk_config.dat
	app/KCC/cgi-bin/datos/tbk_param.txt
	app/KCC/cgi-bin/datos/tbk_trace.dat
	app/KCC/cgi-bin/maestros/privada.pem
	app/KCC/cgi-bin/maestros/tbk_public_key.pem
	app/KCC/cgi-bin/maestros/tbk_public_key101prod.pem
	app/KCC/cgi-bin/prwp.cgi
	app/KCC/cgi-bin/tbk_bp_pago.cgi
	app/KCC/cgi-bin/tbk_bp_resultado.cgi
	app/KCC/cgi-bin/template/leeme.txt
	app/KCC/cgi-bin/template/reintento.html
	app/KCC/cgi-bin/template/transicion.html
	app/KCC/xt_compra.php
	app/wp-content/plugins/delete-revision/delete-revision-zh_CN.po
	app/wp-content/plugins/delete-revision/delete-revision.php
	app/wp-content/themes/tsc/css/button.css
	app/wp-content/themes/tsc/css/form.css
	app/wp-content/themes/tsc/css/style.css
	app/wp-content/themes/tsc/error_log
	app/wp-content/themes/tsc/functions.php
	app/wp-content/themes/tsc/functions/function-webpay.php
	app/wp-content/themes/tsc/js/apps.js
	app/wp-content/themes/tsc/js/jquery.PrintArea.js_4.js
	app/wp-content/themes/tsc/page-templates/actualizar-contacto.php
	app/wp-content/themes/tsc/page-templates/detalle-tarjeta.php
	app/wp-content/themes/tsc/page-templates/recarga-webpay-fracaso.php
	app/wp-content/themes/tsc/page-templates/recarga-webpay-submit.php
	app/wp-content/themes/tsc/page-templates/resumen-saldo.php
	app/wp-content/themes/tsc/politicas-de-devolucion.pdf
update 15-11v2