Merge pull request #88 from rampo/master

Spanish fixes to develop
Merge pull request #91 from rampo/master

Pull
Merge pull request #92 from rampo/master

2.1.1 in develop
Fixed #93
Merge pull request #94 from rampo/hotfix

Fixed #93
Merge pull request #95 from rampo/develop

Fixed #93 in master