deaing with time zone conversion
feature added, test coverage updated
Merge branch 'make_fields_configurable' into develop
Merge branch 'develop'