Ident type detection
Merge branch 'contact_ident'

Conflicts:
	db/schema.rb