added location
Merge branch 'master' of github.com:ungarst/vsm-nfc

Conflicts:
	src/se761/bestgroup/vsmreceiver/LogActivity.java