changing entryRelationship attribute type to typeCode for continuously variable value
call population_count with 2 arguments
Merge branch 'typecode' into nmedw

* typecode:
  changing entryRelationship attribute type to typeCode for continuously variable value
Merge branch 'population_count' into nmedw

* population_count:
  call population_count with 2 arguments