db関数を更新。（呼び出し側で　$db = db(); を実行）
Merge branch 'master' into matsui

Conflicts:
	common.php