cr housing units + evr improvements. Updated
Merge pull request #841 from FrancescoMino/master

cr housing units + evr improvements