MainActivityまわりを更新
MainActivityまわりを更新
Merge commit '09d9190365730386f67e5e7a40e9563134dcb088' into simple-client