201310020930

team_box_score_total
Merge branch 'master-20130930' of https://github.com/nt46/Imagic into master-20130930

Conflicts:
	db/development.sqlite3
	log/development.log