Merge pull request #25 from dianmorales/1.5.x

1.5.x
Merge branch '1.5.x' of github.com:encuestame/encuestame into 1.5.x
[enme ci] Automated branch merge (from 1.5.x:71b3e2f9ae7a81aaff188e93982aca16c26886ab)