Removed annotations
Merge remote-tracking branch 'origin/master'
Modified Preference.
About Activity
Fix some bugs