Se agregan redes sociales
Merge branch 'master' of github.com:kurkop/openzix

Conflicts:
	openzix/templates/base.html

	modified:   openzix/templates/base.html
	modified:   openzix/settings.py
	modified:   openzix/templates/base.html
pull
Se añade el registro en una ventana pop, se añade ícono de openzix