Merge pull request #1 from GeographicaGS/dev_javier

Dev javier
Login working
Layout start
Fixed conflicts
CHanges
paleta