チェック

更新
Merge branch 'HEAD' of https://github.com/pcpfukuoka/pcp2012.git

Conflicts:
	UserManager/change_view.php