Fixed setup page.
Merge branch 'development' of github.com:encuestame/encuestame into development