add basic charset choice to the upload form
handle charset on layer save
Added charset option to create_featurestore
Added charset encoding to save method
Get charset from upload form.
Fixed merge conflict
Fixed merge conflict
Merge branch 'master' of github.com:GeoNode/geonode
Merge branch 'master' of github.com:GeoNode/geonode