bug
Merge branch 'master' of https://github.com/walk-with-me/walk-with-me

Conflicts:
	Walk With Me/WWMCaretakerViewController.m