Manual merge

Had to do manual merge after the wild reformating shitstorm in settings
model and main app source.