commento nel manifest
il mio commento
fixed references and keys
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tracking/AndroidManifest.xml
	Tracking/bin/AndroidManifest.xml