Registro condiciones
MallTopic News
Merge remote-tracking branch 'origin/master'

Conflicts:
	MallTopicBetaUltimoFinalChrismas/www/main.html
Revert "Registro condiciones"

This reverts commit 7f10a10b83069ccfed13fcd1b56efd13b7e13c7a.