Merge remote-tracking branch 'origin/master' into enlargeDB
v1
purchaseOrder
Merge remote-tracking branch 'origin/SeveralCertificatesUI' into heatANDpurchase

Conflicts:
	src/PrizmMainProject/PrizmApplication.csproj
	src/PrizmMainProject/PrizmModule.cs
extract fill method
v1
move NewHeatCombo from command to form
Merge remote-tracking branch 'origin/master' into Purchase

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
Merge remote-tracking branch 'origin/master' into Purchase

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/ExtractHeatsCommand.cs
fix
Merge remote-tracking branch 'origin/master' into Purchase
Merge pull request #443 from olga-jane/Purchase

Heat & Purchase