adding scheme designer file
merge and icons fix
Some works on schemes designer
Merge remote-tracking branch 'upstream/master'
fixing some issues in from import dialog
Merge pull request #1633 from diegosarmentero/master

fixing some issues in from import dialog