mar24
mar 24
Merge branch 'go-live' of github.com:thesciz/DrnkToAlpha into go-live

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Gemfile~
	README
	Rakefile
	app/assets/images/rails.png
	app/assets/javascripts/application.js
	app/assets/javascripts/application.js~
	app/assets/javascripts/autocomplete-rails.js
	app/assets/javascripts/diapo.js
	app/assets/javascripts/game.js.coffee
	app/assets/javascripts/gamebox.js.coffee
	app/assets/javascripts/gamefavorites.js.coffee
	app/assets/javascripts/identities.js.coffee
	app/assets/javascripts/jquery.easing.1.3.js
	app/assets/javascripts/jquery.hoverIntent.minified.js
	app/assets/javascripts/layout-grid.js
	app/assets/javascripts/layout-grid.js~
	app/assets/javascripts/main.js.coffee
	app/assets/javascripts/other.js.coffee
	app/assets/javascripts/sessions.js.coffee
	app/assets/javascripts/tvshow.js.coffee
	app/assets/javascripts/user.js.coffee
	app/assets/javascripts/waypoints.js
	app/assets/javascripts/waypoints.min.js
	app/assets/javascripts/widget.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/css/twitter/widget.css
	app/assets/stylesheets/drnk-to_themed.css
	app/assets/stylesheets/drnk-to_themed.css~
	app/assets/stylesheets/game.css.scss
	app/assets/stylesheets/gamebox.css.scss
	app/assets/stylesheets/gamefavorites.css.scss
	app/assets/stylesheets/identities.css.scss
	app/assets/stylesheets/jquery-ui-1.8.2.custom.css
	app/assets/stylesheets/main.css.scss
	app/assets/stylesheets/other.css.scss
	app/assets/stylesheets/sessions.css.scss
	app/assets/stylesheets/tvshow.css.scss
	app/assets/stylesheets/user-login.css
	app/assets/stylesheets/user-login.css~
	app/assets/stylesheets/user.css.scss
	app/controllers/application_controller.rb
	app/controllers/game_favorites_controller.rb
	app/controllers/gameboxes_controller.rb
	app/controllers/games_controller.rb
	app/controllers/games_controller.rb~
	app/controllers/identities_controller.rb
	app/controllers/identities_controller.rb~
	app/controllers/main_controller.rb
	app/controllers/main_controller.rb~
	app/controllers/other_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/sessions_controller.rb~
	app/controllers/tvshow_controller.rb
	app/controllers/user_controller.rb
	app/controllers/user_controller.rb~
	app/helpers/application_helper.rb
	app/helpers/game_helper.rb
	app/helpers/gamebox_helper.rb
	app/helpers/gamefavorites_helper.rb
	app/helpers/identities_helper.rb
	app/helpers/main_helper.rb
	app/helpers/other_helper.rb
	app/helpers/sessions_helper.rb
	app/helpers/tvshow_helper.rb
	app/helpers/user_helper.rb
	app/mailers/.gitkeep
	app/mailers/user_mailer.rb
	app/mailers/user_mailer.rb~
	app/models/.gitkeep
	app/models/game.rb
	app/models/game.rb~
	app/models/game_comment.rb
	app/models/game_favorite.rb
	app/models/game_material.rb
	app/models/game_vote.rb
	app/models/gamebox.rb
	app/models/gamebox_favorite.rb
	app/models/identity.rb
	app/models/identity.rb~
	app/models/recipe.rb
	app/models/recipe.rb~
	app/models/recipe_comment.rb
	app/models/recipe_comment.rb~
	app/models/recipe_direction.rb
	app/models/recipe_direction.rb~
	app/models/recipe_ingredient.rb
	app/models/recipe_ingredient.rb~
	app/models/recipe_vote.rb
	app/models/recipe_vote.rb~
	app/models/rule.rb
	app/models/user.rb
	app/models/user.rb~
	app/views/game_favorites/create.html.erb
	app/views/game_favorites/create.js.erb
	app/views/gameboxes/_gamebox_header.html.erb
	app/views/gameboxes/_gamebox_header.html.erb~
	app/views/gameboxes/index.html.erb
	app/views/gameboxes/show.html.erb
	app/views/gameboxes/show.html.erb~
	app/views/games/_game_material_fields.html.erb
	app/views/games/_rule_fields.html.erb
	app/views/games/new.html.erb
	app/views/games/show.html.erb
	app/views/games/show.html.erb~
	app/views/games/show2.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/application.html.erb~
	app/views/layouts/application2.html.erb
	app/views/main/_slider.html.erb
	app/views/main/index.html.erb
	app/views/main/index.html.erb~
	app/views/main/index2.html.erb
	app/views/other/index.html.erb
	app/views/shared/_adspace.html.erb
	app/views/shared/_new_game_summary.html.erb
	app/views/shared/_right.html.erb
	app/views/shared/_section_head_left.html.erb
	app/views/tvshow/index.html.erb
	app/views/user/show.html.erb
	app/views/user/show.html.erb~
	app/views/user_mailer/registration_confirmation.html.erb
	app/views/user_mailer/registration_confirmation.html.erb~
	app/views/user_mailer/registration_confirmation.text.erb~
	branch-test.txt
	branch-test.txt~
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/development.rb~
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/omniauth.rb
	config/initializers/omniauth.rb~
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/setup_mail.rb
	config/initializers/setup_mail.rb~
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	config/routes.rb~
	db/migrate/20120126073710_create_users.rb
	db/migrate/20120126074221_create_gameboxes.rb
	db/migrate/20120126074305_create_games.rb
	db/migrate/20120126074345_create_rules.rb
	db/migrate/20120126074432_create_game_comments.rb
	db/migrate/20120126074447_create_game_favorites.rb
	db/migrate/20120126074528_create_game_votes.rb
	db/migrate/20120126074607_create_gamebox_favorites.rb
	db/migrate/20120214035314_add_stuff_to_users.rb
	db/migrate/20120214041355_remove_stuff_from_users.rb
	db/migrate/20120214042245_add_more_user_stuffs.rb
	db/migrate/20120229232447_new_game_data.rb
	db/migrate/20120229234144_create_game_materials.rb
	db/migrate/20120310050004_create_identities.rb
	db/migrate/20120310050038_add_identity_column_to_user.rb
	db/migrate/20120310050038_add_identity_column_to_user.rb~
	db/migrate/20120310111210_add_allow_email_to_users.rb
	db/migrate/20120310111210_add_allow_email_to_users.rb~
	db/migrate/20120314214654_create_recipes.rb
	db/migrate/20120315000324_create_recipe_ingredients.rb
	db/migrate/20120315000428_create_recipe_directions.rb
	db/migrate/20120315021858_create_recipe_votes.rb
	db/migrate/20120316073112_create_recipe_comments.rb
	db/migrate/20120316081305_new_user_fields.rb
	db/migrate/20120316081305_new_user_fields.rb~
	db/schema.rb
	db/seeds.rb
	db/seeds.rb~
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/blog-style.css
	public/css/twitter/widget.css
	public/diapo.css
	public/drnk-to_themed.css
	public/drnk-to_themed.css~
	public/drnkto_style.css
	public/drnkto_style_test.css
	public/drnkto_style_test.css~
	public/drnkto_style_test_alt.css
	public/favicon.ico
	public/images/1.png
	public/images/2.jpg
	public/images/3.jpg
	public/images/4.jpg
	public/images/43.jpg
	public/images/5.jpg
	public/images/DRNK-responsibly.jpg
	public/images/_notes/dwsync.xml
	public/images/ad-left.jpg
	public/images/ad-top.jpg
	public/images/ad_right-sidebar.jpg
	public/images/ad_skyscraper.jpg
	public/images/bkg-stripe.jpg
	public/images/bkg_mantle.jpg
	public/images/bkg_nav.jpg
	public/images/bkg_sidebar-mantle.jpg
	public/images/bkg_sub-mantle.jpg
	public/images/btn-favourites.jpg
	public/images/btn_user-action.jpg
	public/images/btn_user-action_drink-recipe.png
	public/images/btn_user-action_invite.png
	public/images/btn_user-action_organize.png
	public/images/btn_user_organize.jpg
	public/images/button_watch-now.jpg
	public/images/create-button.jpg
	public/images/create-button_alt.jpg
	public/images/create-button_light.jpg
	public/images/demo/arrow_caption.png
	public/images/demo/list-check-green.png
	public/images/demo/list-error.png
	public/images/diapo/next.png
	public/images/diapo/pause.png
	public/images/diapo/play.png
	public/images/diapo/prev.png
	public/images/dp-placeholder_small.jpg
	public/images/drnk_game-of-thrones_bkg.jpg
	public/images/drnk_large-logo_orange.jpg
	public/images/drnk_twitter-logo.jpg
	public/images/drnk_twitter-logo_black.jpg
	public/images/facebook_icon.png
	public/images/fb-placeholder.jpg
	public/images/feature-test.jpg
	public/images/feature-test_about.jpg
	public/images/game_clash-of-kings.jpg
	public/images/game_img_placeholder2.png
	public/images/gamebox_favourite.jpg
	public/images/gamebox_game-of-thrones.jpg
	public/images/gamebox_game-of-thrones_small.jpg
	public/images/gamebox_images/1.png
	public/images/gamebox_images/2.jpg
	public/images/gamebox_images/3.jpg
	public/images/gamebox_images/4.jpg
	public/images/gamebox_images/43.jpg
	public/images/gamebox_images/5.jpg
	public/images/gamebox_img-bkg.jpg
	public/images/go_button.png
	public/images/guess-button.png
	public/images/guess-button3.png
	public/images/headline_bkg.jpg
	public/images/icons/basics_chessboard.jpg
	public/images/icons/basics_dice1.jpg
	public/images/icons/basics_two-player.jpg
	public/images/icons/basics_versus.jpg
	public/images/images.jpg
	public/images/item-type_game.jpg
	public/images/item-type_question.jpg
	public/images/item-type_recipe.jpg
	public/images/logo-small.png
	public/images/logo-smaller.png
	public/images/logo.png
	public/images/logo_themed_game-of-thrones.jpg
	public/images/random-button.png
	public/images/random-button2.png
	public/images/random-button3.png
	public/images/search.png
	public/images/shadow_small.jpg
	public/images/share-buttons.jpg
	public/images/slides/.DS_Store
	public/images/slides/_notes/dwsync.xml
	public/images/slides/big_buck_bunny.jpg
	public/images/slides/megamind1048.jpg
	public/images/slides/megamind_07.jpg
	public/images/slides/ratatouille2.jpg
	public/images/slides/up-official-trailer-fake.jpg
	public/images/slides/wall-e.jpg
	public/images/social-buttons.png
	public/images/social-buttons_alt.png
	public/images/social_facebook.jpg
	public/images/social_twitter.jpg
	public/images/store-item_scene-it.jpg
	public/images/store-item_the-office-sweater.jpg
	public/images/thumbs/.DS_Store
	public/images/thumbs/_notes/dwsync.xml
	public/images/thumbs/big_buck_bunny.jpg
	public/images/thumbs/megamind1048.jpg
	public/images/thumbs/megamind_07.jpg
	public/images/thumbs/ratatouille2.jpg
	public/images/thumbs/thumb_gameofthrones.jpg
	public/images/thumbs/up-official-trailer-fake.jpg
	public/images/thumbs/wall-e.jpg
	public/images/trans.png
	public/images/twitter-backdrop_alt.jpg
	public/images/twitter_icon.png
	public/images/user-avatar.jpg
	public/robots.txt
	rgergergerge
	test/fixtures/.gitkeep
	test/fixtures/game_comments.yml
	test/fixtures/game_favorites.yml
	test/fixtures/game_materials.yml
	test/fixtures/game_votes.yml
	test/fixtures/gamebox_favorites.yml
	test/fixtures/gameboxes.yml
	test/fixtures/games.yml
	test/fixtures/identities.yml
	test/fixtures/recipe_comments.yml
	test/fixtures/recipe_directions.yml
	test/fixtures/recipe_ingredients.yml
	test/fixtures/recipe_votes.yml
	test/fixtures/recipes.yml
	test/fixtures/rules.yml
	test/fixtures/users.yml
	test/functional/.gitkeep
	test/functional/game_controller_test.rb
	test/functional/gamebox_controller_test.rb
	test/functional/gamefavorites_controller_test.rb
	test/functional/identities_controller_test.rb
	test/functional/main_controller_test.rb
	test/functional/other_controller_test.rb
	test/functional/sessions_controller_test.rb
	test/functional/tvshow_controller_test.rb
	test/functional/user_controller_test.rb
	test/functional/user_mailer_test.rb
	test/integration/.gitkeep
	test/performance/browsing_test.rb
	test/test_helper.rb
	test/unit/.gitkeep
	test/unit/game_comment_test.rb
	test/unit/game_favorite_test.rb
	test/unit/game_material_test.rb
	test/unit/game_test.rb
	test/unit/game_vote_test.rb
	test/unit/gamebox_favorite_test.rb
	test/unit/gamebox_test.rb
	test/unit/helpers/game_helper_test.rb
	test/unit/helpers/gamebox_helper_test.rb
	test/unit/helpers/gamefavorites_helper_test.rb
	test/unit/helpers/identities_helper_test.rb
	test/unit/helpers/main_helper_test.rb
	test/unit/helpers/other_helper_test.rb
	test/unit/helpers/sessions_helper_test.rb
	test/unit/helpers/tvshow_helper_test.rb
	test/unit/helpers/user_helper_test.rb
	test/unit/identity_test.rb
	test/unit/recipe_comment_test.rb
	test/unit/recipe_direction_test.rb
	test/unit/recipe_ingredient_test.rb
	test/unit/recipe_test.rb
	test/unit/recipe_vote_test.rb
	test/unit/rule_test.rb
	test/unit/user_test.rb
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep