Includes PopIt as required in issue #72
Modifies tests to use local popit
Merge pull request #87 from ciudadanointeligente/local-services

Merge 'local-services' to 'master' branch