trying encoding with Windows-1252
Merge branch 'master' into production
Merge branch 'staging' into production
Merge branch 'staging' into production
Merge branch 'staging' into production
Merge branch 'staging' into production
Merge branch 'staging' into production
++
add legend
display more info for state
fix facturacion electronica bug
add teleop mail
++
add user name
merge conflicts
++
++
add research field
merge conflicts
tr for legent