task #014-Master_class_text_import: Fixed
Merge branch '014-Master_class_text_import' into develop