Update for Slic3r 1.1.5
Update for Slic3r 1.1.5
Merge branch 'master' of https://github.com/Aqueouswater/PrinterSettings

Conflicts:
	Slic3r/print/0.2 Nosupport.ini
	Slic3r/print/1.1.0 Only Support.ini
	Slic3r/slic3r.ini