added skirt to print size calculation for --duplicate
added skirt to print size calculation for --duplicate

Conflicts:

	lib/Slic3r/Print.pm

lordofhyphens/Slic3r,mcilhargey/Slic3r,platsch/Slic3r,xoan/Slic3r,pieis2pi/Slic3r,prusa3d/Slic3r,alexrj/Slic3r,alexrj/Slic3r,pieis2pi/Slic3r,alexrj/Slic3r,platsch/Slic3r,mcilhargey/Slic3r,pieis2pi/Slic3r,xoan/Slic3r,lordofhyphens/Slic3r,lordofhyphens/Slic3r,xoan/Slic3r,prusa3d/Slic3r,prusa3d/Slic3r,mcilhargey/Slic3r,alexrj/Slic3r,curieos/Slic3r,mcilhargey/Slic3r,lordofhyphens/Slic3r,curieos/Slic3r,tmotl/Slic3r,tmotl/Slic3r,pieis2pi/Slic3r,pieis2pi/Slic3r,prusa3d/Slic3r,curieos/Slic3r,tmotl/Slic3r,alexrj/Slic3r,platsch/Slic3r,alexrj/Slic3r,tmotl/Slic3r,prusa3d/Slic3r,lordofhyphens/Slic3r,tmotl/Slic3r,mcilhargey/Slic3r,curieos/Slic3r,pieis2pi/Slic3r,xoan/Slic3r,lordofhyphens/Slic3r,platsch/Slic3r,tmotl/Slic3r,platsch/Slic3r,xoan/Slic3r,curieos/Slic3r,xoan/Slic3r,curieos/Slic3r,prusa3d/Slic3r,mcilhargey/Slic3r,platsch/Slic3r,prusa3d/Slic3r,mcilhargey/Slic3r