changes as per DH email
Merge branch 'master' of github.com:tobiasquinn/dreamfactory_nfc