s
Merge branch 'master' of github.com:sergiomonge10/soporte

Conflicts:
	soporte/apps/support/views.pyc
	soporte/settings.pyc
Solucionado posicion de boton