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

Conflicts:
	db/schema.rb

db/schema.rb

@@ -11,7 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20140925073734) do
+=======
+ActiveRecord::Schema.define(version: 20140925101927) do
+>>>>>>> 662806d8c92f67dda55ee91326dfb5f89ddfc230
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -190,6 +194,15 @@ ActiveRecord::Schema.define(version: 20140925073734) do
     t.integer  "role_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "email"
+    t.integer  "sign_in_count",      default: 0,     null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.inet     "current_sign_in_ip"
+    t.inet     "last_sign_in_ip"
+    t.boolean  "admin",              default: false
+    t.string   "identity_code"
+    t.integer  "registrar_id"
   end
 
 end