Add CIDR criteria for entity rules (for ip and subnet). closes #2452
Add CIDR criteria for entity rules (for ip and subnet). closes #2452

Conflicts:
	inc/inventoryruleentity.class.php

TECLIB/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi