Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

1 files changed, 10 insertions, 5 deletions

diff --git a/db/schema.rb b/db/schema.rb
index c3be661..113f16d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140401215809) do
+ActiveRecord::Schema.define(version: 20140403155049) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -90,7 +90,7 @@ ActiveRecord::Schema.define(version: 20140401215809) do
   create_table "remote_usernames", force: true do |t|
     t.integer  "game_id"
     t.integer  "user_id"
-    t.text     "json_value"
+    t.string   "user_name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -121,10 +121,12 @@ ActiveRecord::Schema.define(version: 20140401215809) do
 
   create_table "sessions", force: true do |t|
     t.integer  "user_id"
+    t.string   "token"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true
   add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
 
   create_table "teams", force: true do |t|
@@ -155,6 +157,11 @@ ActiveRecord::Schema.define(version: 20140401215809) do
     t.string   "name"
     t.integer  "game_id"
     t.integer  "status"
+    t.integer  "min_players_per_team"
+    t.integer  "max_players_per_team"
+    t.integer  "min_teams_per_match"
+    t.integer  "max_teams_per_match"
+    t.integer  "set_rounds"
     t.boolean  "randomized_teams"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -169,12 +176,10 @@ ActiveRecord::Schema.define(version: 20140401215809) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "password_digest"
-    t.string   "remember_token"
-    t.integer  "groups"
+    t.integer  "permissions"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end