f
Merge branch 'master' of https://github.com/scarmich/SmartDraft

Conflicts:
	Src/SmartDraft.v11.suo
	Src/SmartDraft/bin/Debug/SmartDraft.exe
	Src/SmartDraft/bin/Debug/SmartDraft.pdb
	Src/SmartDraft/obj/Debug/SmartDraft.exe
	Src/SmartDraft/obj/Debug/SmartDraft.pdb