Merge branch 'hotfix/deploy_no_assets'
Merge branch 'develop'
Merge branch 'hotfix/to_reserve_button'

* hotfix/to_reserve_button:
  add button to reserve to accepted users
Merge branch 'develop'

* develop:
  fix button
add configus
add config
new ui for market_dream
edit config
2 last news is viewd on welcome
add configus to all envst
add end_reg page
add recirect if can_registred
fix test
Merge branch 'hotfix/end_reg' into develop

* hotfix/end_reg:
  fix test
  add recirect if can_registred
  add end_reg page
  add configus to all envst
  2 last news is viewd on welcome
  edit config
  new ui for market_dream
  add config
  add configus

Conflicts:
	Gemfile
	config/locales/ru.yml