Merge pull request #3 from juanpicado/master

Merge from juanpicado repository
ENCUESTAME-651  More unit tests enabled, added json resources