Merged the address types
Merge branch 'master' of github.com:internetee/registry

Conflicts:
	db/schema.rb
Fixed db/schema merge mishap
Removed unnecessary transaction block from contact
Fixed the admin-part of contact address
Merge branch 'master' of github.com:internetee/registry
Merge branch 'master' of github.com:internetee/registry

Conflicts:
	app/views/admin/domains/index.haml
Merge branch 'master' of github.com:internetee/registry
Merge branch 'master' of github.com:internetee/registry