Remove 'content' extra layer during 'ndef-discovered'
Merge branch 'master' of ssh://github.com/svic/gaia into master_nfctag