cleanup navProp logic for inheritance
Merge branch 'master' of https://github.com/IdeaBlade/Breeze

Conflicts:
	Breeze.Client/Scripts/IBlade/a40_entityMetadata.js