Had to add back in an auto-increment PersonID since some contacts may not have a userid, so that eliminated the ability to use it for the key.

$424
Merge branch 'master' of https://github.com/samilliken/openDCIM

Conflicts:
	db-3.3-to-4.0.sql