add settings and about activity
Merge branch 'dev-shz'