Merge branch 'jesus' of https://github.com/alineweblabs/SAMM into roberto
--
update after pull
Update samm
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