Merge branch 'hotfix/lp' into develop

* 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/*
  ...
replace paperclip to carrierwave
remove *.sqlite
genry fix
passed some tests
passed next one test
remove edit user
add public_work factiry
add nomination factory and passed some tests
passed some tests
Merge branch 'hotfix/lp' of github.com:ulmic/NewLookContestReg into develop

* 'hotfix/lp' of github.com:ulmic/NewLookContestReg:
  genry fix
fix genry size
remove bad file
fix test
passed test
remove portfolio tests
remove district_controller from user allow
Merge branch 'feature/paperclip_to_carrierwave' into develop

* feature/paperclip_to_carrierwave:
  remove district_controller from user allow
  remove portfolio tests
  passed test
  fix test
  passed some tests
  add nomination factory and passed some tests
  add public_work factiry
  remove edit user
  passed next one test
  passed some tests
  remove *.sqlite
  replace paperclip to carrierwave
add parallax effect to genry
Merge branch 'develop' of github.com:ulmic/NewLookContestReg into develop

* 'develop' of github.com:ulmic/NewLookContestReg:
  add parallax effect to genry

Conflicts:
	app/assets/stylesheets/application.css