Return null from UnitAdministrator if person/entity is not found
fixes https://github.com/rSmart/issues/issues/173
Make the affiliation types more forgiving on portal tabs
Updated gitignore for src/main/webapp/*

Conflicts:
	.gitignore