working on lost flow
properties
Merge branch 'master' of github.com:adiash/petsy-android

Conflicts:
	AndroidManifest.xml
	project.properties
changed starting activity
Merge branch 'master' of github.com:adiash/petsy-android

Conflicts:
	AndroidManifest.xml