Toilet: 修改了主动记录的界面
Merge branch 'master' into english_Version
Toilet: eng update.
Toilet: runtime error in the settingsActivity.