some changes which I have no idea about
merged the changesMerge branch 'master' of https://github.com/JoonasMelin/tutSlicerSettings

Conflicts:
	mendel/filament/mendel_PLA.ini
	mendel/print/mendel_PLA.ini
	mendel/slic3r.ini