update and fixe bug no conflicts

i ve make some new block and i ve merge my source with the origin to resolve conflict.

i ve create new block :
-rfid in deuinoedu

mouse in duinoedu
set string variable
operator on string -equals
equalsignorecase -toint -compareto
==,<,>,<=,>= , !=