a
Merge remote-tracking branch 'origin/master'

Conflicts:
	AutoPaper/AutoPaper.v12.suo
	AutoPaper/AutoPaper/bin/AutoPaper.dll
	AutoPaper/AutoPaper/bin/AutoPaper.pdb

	AutoPaper/AutoPaper/obj/Debug/AutoPaper.csprojResolveAssemblyReference.cache
	AutoPaper/AutoPaper/obj/Debug/AutoPaper.dll
	AutoPaper/AutoPaper/obj/Debug/AutoPaper.pdb