jh
sorpresa!
Merge branch 'master' of github.com:sergiomonge10/soporte

Conflicts:
	soporte/apps/support/urls.pyc
	soporte/apps/support/views.pyc
	soporte/settings.pyc
	soporte/urls.pyc
Merge branch 'master' of github.com:sergiomonge10/soporte

Conflicts:
	soporte/apps/support/views.pyc
	soporte/templates/support/product.html
	soporte/urls.pyc