no message
Merge pull request #11 from hoyuela/dev

no message
no message
Merge pull request #12 from hoyuela/dev

no message
logging toasts
Merge branch 'master' of https://github.com/dannycohn/Sitter-Android
Merge pull request #13 from azsuth/master

logging toasts
Merge branch 'master' of https://github.com/dannycohn/Sitter-Android

# By Solstice Loaner #13 (2) and Andrew Sutherland (1)
# Via Andrew Sutherland (2) and others
* 'master' of https://github.com/dannycohn/Sitter-Android:
  logging toasts
  no message
  no message

Conflicts:
	Sitter/AndroidManifest.xml