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

Conflicts:
	inc/inventoryruleentity.class.php
Fix error in entity form. closes #2650

Conflicts:
	inc/entity.class.php
Fix operatingsystem version. closes #2648
Clean
Fix software problem with quote in computer inventory. closes #2645
Fix entity rule problem. closes #2635