QA #5
Merge branch 'master' of https://github.com/israel-viveros/control-css-js-Televisa.com

Conflicts:
	css/indices/file.css