Bridge
Merge branch 'Organizacao' of https://github.com/Tenkel/SALI.git into
Organizacao

Conflicts:
	AutoTracking/AndroidManifest.xml