Added more 'TODO' comments and associated bugzilla entries to it.
- Removed unnecessary code snippet in NfcContentHelper
Merge branch 'master' of ssh://github.com/svic/mozilla-central into master3