In progress
full rails
mailer new config
assets precompile
log level error
fix activate url
text
smt
Merge branch 'master' of https://github.com/KernelCorp/proff-test
#gt-174 fixed work 1h 30m
#gt-183 Fixed work 2d2h
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/assets/images/landing.styl
	app/assets/stylesheets/landing.styl
	app/assets/stylesheets/lib/landing.styl
	app/controllers/landing_controller.rb
	app/views/landing/index.slim
	config/database.yml
fix feature
Merge remote-tracking branch 'origin/master'
Final push
assets precompile
assets precompile
assets precompile
fix js
bootstrap