Update commcare-settings-layout.yaml

Move CommCare version from java to general settings
Update commcare-app-settings.yaml

Add description for CommCare version
Update commcare-app-settings.yaml

fix typo
Merge pull request #2149 from dimagi/settings_ui

Settings ui changes