merge with mac changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/bienprogramming/pound/app/Fragment/PetFragment.java
Download GSON changes