Merge branch 'hotfix/lp'

* hotfix/lp: (25 commits)
  fix tests
  add button and text to lp
  add genry
  add genry
  fixed background
  add background
  edit gitignore
  add logo to make up
  add inформат logo
  some adds
  add email validatator
  remove fixtures to passed tests
  replace initializer to seed
  remove initializer
  replace seeds.rb
  add pulldown-logo
  add copyright
  new config/application.rb
  add welcome controller
  remove tmp/*
  ...
Merge branch 'develop'

* develop: (53 commits)
  add phone factory
  add button to view user profile
  add make up to users/show
  add phone validator
  add locales of error:
  edit seeds
  edit user factory
  add user password
  edit order of attributes
  edit district title
  remove publish users.errors on users/form
  edit application.rb
  add admin/application controller
  remove basic_auth
  fix inputs on users/new
  add offset to content without main page
  fix main pge
  good index page
  some random adds
  fix test
  ...
production added