Merge branch 'clean2'

Conflicts:
	app/assets/stylesheets/static.css.scss
	app/controllers/static_controller.rb

31 files changed, 1 insertions, 1 deletions

diff --git a/db/migrate/20140422172559_create_simple_captcha_data.rb b/db/migrate/20140423205436_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140422172559_create_simple_captcha_data.rb
+++ b/db/migrate/20140423205436_create_simple_captcha_data.rb
diff --git a/db/migrate/20140422212555_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140424005433_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140422212555_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140424005433_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140422212556_add_notified_object.mailboxer_engine.rb b/db/migrate/20140424005434_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140422212556_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140424005434_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140422212557_add_notification_code.mailboxer_engine.rb b/db/migrate/20140424005435_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140422212557_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140424005435_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140422212558_add_attachments.mailboxer_engine.rb b/db/migrate/20140424005436_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140422212558_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140424005436_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140422212559_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140424005437_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140422212559_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140424005437_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140422212560_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140424005438_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140422212560_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140424005438_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140422212602_create_delayed_jobs.rb b/db/migrate/20140424005439_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140422212602_create_delayed_jobs.rb
+++ b/db/migrate/20140424005439_create_delayed_jobs.rb
diff --git a/db/migrate/20140422212605_create_servers.rb b/db/migrate/20140424005442_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140422212605_create_servers.rb
+++ b/db/migrate/20140424005442_create_servers.rb
diff --git a/db/migrate/20140422212609_create_matches.rb b/db/migrate/20140424005445_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140422212609_create_matches.rb
+++ b/db/migrate/20140424005445_create_matches.rb
diff --git a/db/migrate/20140422212613_create_teams.rb b/db/migrate/20140424005448_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140422212613_create_teams.rb
+++ b/db/migrate/20140424005448_create_teams.rb
diff --git a/db/migrate/20140422212616_create_alerts.rb b/db/migrate/20140424005451_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140422212616_create_alerts.rb
+++ b/db/migrate/20140424005451_create_alerts.rb
diff --git a/db/migrate/20140422212619_create_pms.rb b/db/migrate/20140424005454_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140422212619_create_pms.rb
+++ b/db/migrate/20140424005454_create_pms.rb
diff --git a/db/migrate/20140422212623_create_tournaments.rb b/db/migrate/20140424005457_create_tournaments.rb
index 716871f..716871f 100644
--- a/db/migrate/20140422212623_create_tournaments.rb
+++ b/db/migrate/20140424005457_create_tournaments.rb
diff --git a/db/migrate/20140422212627_create_games.rb b/db/migrate/20140424005500_create_games.rb
index 46ed30d..46ed30d 100644
--- a/db/migrate/20140422212627_create_games.rb
+++ b/db/migrate/20140424005500_create_games.rb
diff --git a/db/migrate/20140422212630_create_users.rb b/db/migrate/20140424005503_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140422212630_create_users.rb
+++ b/db/migrate/20140424005503_create_users.rb
diff --git a/db/migrate/20140422212634_create_sessions.rb b/db/migrate/20140424005506_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140422212634_create_sessions.rb
+++ b/db/migrate/20140424005506_create_sessions.rb
diff --git a/db/migrate/20140422212637_create_brackets.rb b/db/migrate/20140424005509_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140422212637_create_brackets.rb
+++ b/db/migrate/20140424005509_create_brackets.rb
diff --git a/db/migrate/20140422212641_create_game_settings.rb b/db/migrate/20140424005512_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140422212641_create_game_settings.rb
+++ b/db/migrate/20140424005512_create_game_settings.rb
diff --git a/db/migrate/20140422212644_create_tournament_settings.rb b/db/migrate/20140424005515_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140422212644_create_tournament_settings.rb
+++ b/db/migrate/20140424005515_create_tournament_settings.rb
diff --git a/db/migrate/20140422212648_create_tournament_stages.rb b/db/migrate/20140424005519_create_tournament_stages.rb
index e3668cb..e3668cb 100644
--- a/db/migrate/20140422212648_create_tournament_stages.rb
+++ b/db/migrate/20140424005519_create_tournament_stages.rb
diff --git a/db/migrate/20140422212651_create_statistics.rb b/db/migrate/20140424005523_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140422212651_create_statistics.rb
+++ b/db/migrate/20140424005523_create_statistics.rb
diff --git a/db/migrate/20140422212654_create_remote_usernames.rb b/db/migrate/20140424005527_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140422212654_create_remote_usernames.rb
+++ b/db/migrate/20140424005527_create_remote_usernames.rb
diff --git a/db/migrate/20140422212657_create_bracket_matches.rb b/db/migrate/20140424005530_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140422212657_create_bracket_matches.rb
+++ b/db/migrate/20140424005530_create_bracket_matches.rb
diff --git a/db/migrate/20140422212701_create_api_requests.rb b/db/migrate/20140424005533_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140422212701_create_api_requests.rb
+++ b/db/migrate/20140424005533_create_api_requests.rb
diff --git a/db/migrate/20140422212704_create_tournament_players_join_table.rb b/db/migrate/20140424005536_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140422212704_create_tournament_players_join_table.rb
+++ b/db/migrate/20140424005536_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140422212707_create_tournament_hosts_join_table.rb b/db/migrate/20140424005539_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140422212707_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140424005539_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140422212711_create_team_user_join_table.rb b/db/migrate/20140424005542_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140422212711_create_team_user_join_table.rb
+++ b/db/migrate/20140424005542_create_team_user_join_table.rb
diff --git a/db/migrate/20140422212714_create_match_team_join_table.rb b/db/migrate/20140424005544_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140422212714_create_match_team_join_table.rb
+++ b/db/migrate/20140424005544_create_match_team_join_table.rb
diff --git a/db/migrate/20140422212727_add_hidden_attrs_to_user.rb b/db/migrate/20140424005552_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140422212727_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140424005552_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index a160f22..c014e84 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: 20140422212727) do
+ActiveRecord::Schema.define(version: 20140424005552) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"