Fix error
FIx narual order. closes #2663
Fix subnet and ip CIDR in entity rules. closes #2452
Fix sql error on some cases (on some android) not get CPU frequency. closes #2659

Conflicts:
	inc/formatconvert.class.php