fix settingsActivity
Merge branch 'develop' of https://github.com/pasangsherpa/sunappugram into develop