add token
Merge branch 'dimi_master' into dimi_master2

Conflicts:
	src/NfcService.cpp
	src/NfcService.h