Merge branch 'master' of https://github.com/fairmat/EquityModels

Conflicts:
	Dupire/DupireEstimator.cs
	Heston/Properties/AssemblyInfo.cs
-Fixed conflicts.