Corrected wrongly merged branch + added loadingDialog
Added 2 settings + moved preferences.xml to right position