combines work on the wizard by Jaime and myself
combines work on the wizard by Jaime and myself

contributes to #128

markwal/Cura,ynotstartups/Wanhao,hmflash/Cura,markwal/Cura,lo0ol/Ultimaker-Cura,fxtentacle/Cura,senttech/Cura,Curahelper/Cura,fxtentacle/Cura,totalretribution/Cura,ynotstartups/Wanhao,totalretribution/Cura,fieldOfView/Cura,senttech/Cura,fieldOfView/Cura,Curahelper/Cura,ad1217/Cura,ad1217/Cura,lo0ol/Ultimaker-Cura,bq/Ultimaker-Cura,hmflash/Cura,bq/Ultimaker-Cura