Settings screen and related dialogs and screens
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	CloudStarProject/CloudStar/src/main/res/values/strings.xml