classifieds fixed bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmazingPetDirectory/res/values/strings.xml