Added NFC support
Merge branch 'master' of https://github.com/meshuamam/GeekCon-2013