Use intermediate LayerFile model during upload.
Fixed keywords saving
Merge pull request #1467 from ingenieroariel/db-upload

Upload with intermediate files