small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmazingPetDirectory/bin/AmazingPetDirectory.apk

	AmazingPetDirectory/bin/classes/directory/adt/amazingpetdirectory/R$id.class
	AmazingPetDirectory/bin/resources.ap_