Merge branch 'dev2.0' into mychanges

Conflicts:
	src/NPoco/Database.cs
	src/NPoco/MultiPocoFactory.cs
	src/NPoco/PocoDataFactory.cs