Fix here.. fix there
Merge branch 'master' of https://github.com/sunnydroid/PetSitterFinder

Conflicts:
	src/com/petsitterfinder/PetSitterFinderApplication.java