Fixed characters ... I'll say: windows encoded (é,í,ó,ñ)
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'