Merge branch 'Eric' into Andy

Conflicts:
	app/views/records/_form.html.erb
Merge branch 'Eric' into Andy

Conflicts:
	app/models/team_user.rb
	app/views/layouts/application.html.erb
Merge branch 'Eric' into Andy

Conflicts:
	db/migrate/20130826071841_add_column_to_match2.rb
	db/migrate/20130826072026_add_column_to_match3.rb
Merge branch 'Eric' into Andy
201308261851
201308270000
201308270017
201308271300
201308271739

刪除game刪除record
201308281217
201308281234
Merge branch 'Eric' into Andy

Conflicts:
	app/controllers/players_controller.rb
	app/views/records/new.html.erb
	app/views/teams/_form.html.erb
	app/views/welcome/index.html.erb
201308280118

MERGE ERIC
Merge branch 'Andy' into Eric

Conflicts:
	app/models/player.rb
	app/views/records/_formEdit.html.erb