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

Conflicts:
	sunappugram/res/values/colors.xml
	sunappugram/res/values/strings.xml