forgot to commit the other day.
Merge branch 'master' of https://github.com/rayrayj92/Amazing-Pet-Directory

Conflicts:
	AmazingPetDirectory/bin/AmazingPetDirectory.apk
	AmazingPetDirectory/bin/classes.dex
	AmazingPetDirectory/bin/classes/directory/adt/amazingpetdirectory/DirectoryMain$LoadAllProducts.class
	AmazingPetDirectory/bin/classes/directory/adt/amazingpetdirectory/DirectoryMain.class