arreglada plantilla con css y js minimizados
Merge branch 'master', remote-tracking branch 'origin' into dev-master-buses