Merge remote-tracking branch 'origin/master'

Conflicts:
	DecomposeForPacking/Debug/DecomposeForPacking.exe
	DecomposeForPacking/Debug/DecomposeForPacking.ilk
	DecomposeForPacking/Debug/DecomposeForPacking.pdb
	DecomposeForPacking/DecomposeForPacking.sdf
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/CL.read.1.tlog
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/CL.write.1.tlog
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/DecomposeForPacking.lastbuildstate
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/cl.command.1.tlog
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/link.command.1.tlog
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/link.read.1.tlog
	DecomposeForPacking/DecomposeForPacking/Debug/Decompos.90960BC2.tlog/link.write.1.tlog
	DecomposeForPacking/DecomposeForPacking/Debug/DecomposeForPacking.log
	DecomposeForPacking/DecomposeForPacking/Debug/main.obj
	DecomposeForPacking/DecomposeForPacking/Debug/vc120.idb
	DecomposeForPacking/DecomposeForPacking/Debug/vc120.pdb