renamed units -> number_of_units. Support for asset_category == "population"

This pull request addresses https://bugs.launchpad.net/oq-engine/+bug/1188102 and https://bugs.launchpad.net/oq-engine/+bug/1188104