petsy
Merge branch 'master' of github.com:adiash/petsy-android

Conflicts:
	src/com/battlehack/petsy/models/Pet.java