add reset button
add comment and cleanup tests
cleanup menu button
nit
fix merge conflict
feedback
Merge pull request #1130 from sunglim/preference_clean

Add preference reset button on Setting dialog.