Resolve minor conflicts and merge updates to settings pane into branch
Resolve minor conflicts and merge updates to settings pane into branch

aptoma/drpublish-imbo-app,aptoma/drpublish-imbo-app,sgulseth/drpublish-imbo-app,sgulseth/drpublish-imbo-app,sgulseth/drpublish-imbo-app,aptoma/drpublish-imbo-app