Upgraded to Simple Injector 2.4
Updated #generated stuff for Simple Injector 2.4
Finalized design and polished small things -- not all done, but ready to integrate to trunk.
Merged 'master' into 'ambition' and fixed some related issues.

Conflicts:
	#generated/FeatureData.json
	#generated/FeatureTests.html
Updated readme.