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