201308261736

合併「球員」及「賽事」為「球隊」
Merge branch 'Eric' of https://github.com/dream78829/wesport into Eric

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