Changed return val for prop keys
reformatted constants
Merge remote-tracking branch 'origin/master'
Added tests for to many / to one / strict uniq id member assoc