Fix import rules action

Conflicts:
	inc/inventoryruleimport.class.php
COntinue add options for entity of computer entity. references ##2470

Conflicts:
	inc/inventorycomputerinventory.class.php
	inc/inventoryruleimport.class.php
	phpunit/2_Integration/ComputerEntityTest.php
	phpunit/custom-build.xml
Ad missing index in antivirus. closes #2488
Fix
Fix import rules action
Merge branch 'glpi0.84' into glpi0.84+entitytransfer

Conflicts:
	inc/inventorycomputerinventory.class.php
	inc/inventoryruleimport.class.php