initial rebase commit

fixed test targets

fixed hardware and software tests to reflect correct tag ids

enabled NFC per default

fixed hiding/showing add-button in NfcFragment/ScriptFragment