fixed line numbering + test on fields count
Merge branch '69_fix_install' into prod
Merge branch '70_fix_pro_eco_import' into prod