Merge branch 'hotfix/market_place_ui'

* hotfix/market_place_ui:
  edit conditions
  some feeatures
  fix template news
  add ui for market_dreams time
Merge branch 'release/1.6'

* release/1.6:
Merge branch 'develop'

* develop:
  blah
  users in welcom in 3*4
remove users
Merge branch 'hotfix/remove_users' into develop

* hotfix/remove_users:
  remove users