Merge branch 'stoewer' into development
Models: add parameter name_mapping to Field

Minor refactoring in declarative_models module.
Model: define name mappings for models
convert.py: use name_mapping for conversion