Resolve conflicts by keeping the consolidated general settings form, porting the firstDayOfWeek Radio.Group fix from dev, and retaining mobile avatar layout improvements from this branch.
Resolve conflicts by keeping the consolidated general settings form, porting the firstDayOfWeek Radio.Group fix from dev, and retaining mobile avatar layout improvements from this branch.