Merge branch 'jesus' of https://github.com/alineweblabs/SAMM into roberto
--
update after pull
Update samm
Edicion de modelo fantasma
update after merge with jesus branch
Comment edit settings.py password
Update Companies
Merge branch 'beto' of https://github.com/alineweblabs/SAMM into beto
Update after merge
update settings.py
Edit before merge
Merge branch 'roberto' of https://github.com/alineweblabs/SAMM into beto

Conflicts:
	samm/templates/layouts/index.html
	samm/templates/main/home.html
update after files and collecstatic added
Update after merge
Add requeriments.txt
Merge branch 'jesus' of https://github.com/alineweblabs/SAMM into beto

Conflicts:
	samm/settings.py
Merge branch 'roberto' of https://github.com/alineweblabs/SAMM into beto
the last updte
despues de pull con beto