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

Conflicts:
	gen/com/battlehack/petsy/R.java
fixed flow
Merge branch 'master' of github.com:adiash/petsy-android

Conflicts:
	AndroidManifest.xml
	src/com/battlehack/petsy/screens/lost/LostHumanDetailsActivity.java
Merge branch 'master' of github.com:adiash/petsy-android

Conflicts:
	gen/com/google/android/gms/R.java