Merge branch 'master' of github.com:domify/registry

Conflicts:
	CHANGELOG.md
	app/mailers/domain_mailer.rb
	app/models/domain.rb
	app/views/layouts/registrant/application.haml
	config/application-example.yml
	config/locales/en.yml
	config/routes.rb
	spec/mailers/domain_mailer_spec.rb

config/routes.rb

@@ -126,6 +126,7 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :whois
     # resources :contacts do
       # member do
         # get 'delete'