classifieds
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmazingPetDirectory/bin/AmazingPetDirectory.apk
	AmazingPetDirectory/bin/classes.dex