good version
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/mediageoloc/ata/MainActivity.java