Se cargan librerias y se eliminan algunas aplciaciones BUGS
Se arrega problema en lbaseuser.html
actualizacion
Merge branch 'master' of github.com:kurkop/openzix

Conflicts:
	openzix/apps/home/forms.pyc
	openzix/apps/home/models.py
	openzix/apps/home/models.pyc
	openzix/apps/users/forms.pyc
	openzix/apps/users/urls.pyc
	openzix/apps/users/views.pyc

	modified:   openzix/apps/home/forms.py
	modified:   openzix/apps/home/models.py
	modified:   openzix/apps/users/forms.py
	modified:   openzix/apps/users/views.py
	modified:   openzix/templates/base.html
	modified:   openzix/templates/baseUser.html
	modified:   openzix/templates/user/index.html
	modified:   openzix/templates/user/soporte.html
Openzix en heroku con todas las liberias actualizadas
Se cambia la version de django en requeriments.txt
Se agregan datos de mandril correo
Se agregan parametros de smtp
Se corrige problema de coma
se añade la linea de defeault from email
Se quita la restriccion de imagenes en el admin
.
Se quita un boton de demo y se agrega el video de openzix
Merge branch 'master' of github.com:kurkop/openzix

Conflicts:
	openzix/apps/home/models.pyc
	openzix/apps/users/forms.pyc
	openzix/apps/users/views.pyc
	openzix/local_settings.py
	openzix/local_settings.pyc
	openzix/settings.py
	openzix/settings.pyc

	modified:   openzix/apps/users/views.py
	modified:   openzix/local_settings.py
	modified:   openzix/templates/baseUser.html
Se quitan menus inncesarios en el momento en user y se arreglar bugs de soporte
se arregla url logout
Nuevo commit con nombre openzix
Version alpha de openzix
Merge branch 'master' of github.com:kurkop/openzix

Conflicts:
	openzix/apps/home/forms.pyc
	openzix/apps/home/urls.pyc
	openzix/apps/home/views.pyc
	openzix/apps/users/admin.pyc
	openzix/apps/users/forms.pyc
	openzix/apps/users/models.pyc
	openzix/apps/users/urls.pyc
	openzix/apps/users/views.pyc

	modified:   openzix/apps/home/forms.py
	modified:   openzix/apps/users/admin.py
	modified:   openzix/apps/users/forms.py
	new file:   openzix/apps/users/imageOz.py
	modified:   openzix/apps/users/models.py
	modified:   openzix/apps/users/urls.py
	modified:   openzix/apps/users/views.py
	modified:   openzix/media/css/estilo.css
	modified:   openzix/templates/base.html
	new file:   openzix/templates/user/crearEmpresa.html
	new file:   openzix/templates/user/editarEmpresa.html
	modified:   openzix/templates/user/empresa.html
	modified:   openzix/templates/user/index.html
Version beta de Openzix