Merge branch 'hotfix/edit_text'

* hotfix/edit_text:
  etxt edit
Merge branch 'release/1.5.2'

* release/1.5.2:
add end_reg_to_market_dreams
Merge branch 'hotfix/end_reg_to_market_dreams' into develop

* hotfix/end_reg_to_market_dreams:
  add end_reg_to_market_dreams