fehler
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/play_services_4_4_52.xml
	nfcbeta/nfcbeta.iml
fehler