add news windows mapSetting.ui
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Move icone to toolbar
Merge pull request #2 from yjacolin/toolbar

Toolbar