Fixed
Merge branch 'master' of https://github.com/jpacora/Plataforma-Comercial

Conflicts:
	static/js/jquery.js