Add support for multiple pk for AbstractDao
Merge branch 'chris-merge'

Conflicts:
	test/dao/VehicleDaoTest.java