Intermediatory commit
MOve user settings rendering to individual apps.
Merge branch 'development' into userSettings