Autofac
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	HtmlParser/AutofacConfig.cs
Merge Fause