Merge branch 'master' of ssh://github.com/ikuwow/winered into ozawa
Merge branch 'master' of ssh://github.com/ikuwow/winered into ozawa
Merge branch 'master' of ssh://github.com/ikuwow/winered into ozawa
マイページ：ユーザー情報更新　病院名以外完成
Merge branch 'ozawa' of github.com:ikuwow/winered

Conflicts:
	app/Model/Kuchikomi.php