- Fix review comments, and some nits.
- Fix contacts, now forwards via activity as-is to import vcard activity in contacts.
Merge branch 'master' of ssh://github.com/svic/gaia

Conflicts:
	apps/system/js/nfc_manager.js