Merge branch 'master' into 19453
Merge remote-tracking branch 'XTUPLE/master'
Merge branch 'master' into 19453
Issue 19806: Added customerType to CustomerProspectRelation
Merge remote-tracking branch 'XTUPLE/master'
Merge branch 'master' into 19453
Merge remote-tracking branch 'XTUPLE/master'
Merge pull request #194 from mikerodonnell89/master

moved contact back to models directory
Issue 19453: Merged in new code.
Issue 19453: Added includeNull to allow expired search
Issue 19453: Removed test code.
Merge pull request #195 from lynnaloo/19453

19453 - Advanced Search Fixes
Merge pull request #52 from xtuple/master

update