Merge branch 'master' of https://github.com/Deuces/DeucesDB into Sevidovsky

Conflicts:
	DeucesDB.iml