Addressed issue #355
Re-enabled SIM imports
Merge remote-tracking branch 'mozilla/master' into issue_355
replaced step to check for 1 import
Merge remote-tracking branch 'mozilla/master' into issue_355
added assert for the contact in the contact API
Merge remote-tracking branch 'mozilla/master' into issue_355
Fixed spaces
Fix contact locator, add check assertions and complete test
Merge pull request #401 from bobsilverberg/contact_photo

Fix contact locator, add check assertions and complete test
Merge pull request #393 from davehunt/fix-desktop

Fix tests for running against the desktop client
Merge pull request #375 from AlinT/issue_355

Addressed issue #355
Added Travis-CI configuration for the B2G desktop client (Firefox OS simulator)