頑張って！
Merge branch '0127_yu_schedulelist2'

Conflicts:
	admin/header.php