@4 lifegame commit
@4 calendar commit
merge m-kishi branch with @4