Merge branch 'master' of https://github.com/mozilla-b2g/gaia into svic_master

Conflicts:
	apps/system/js/nfc_manager.js
Merge branch 'master' of ssh://github.com/svic/gaia into svic_master
Merge branch 'master' of ssh://github.com/svic/gaia into svic_master
Bug 966009 - Use NfcManager DOM APIs 'notifyUserAcceptedP2P' ,
'notifySendFileStatus' instead of dispatching events to nfc dom.