From Local
Merge branch 'master' of https://github.com/hughesrl/icare

Conflicts:
	app/src/main/java/com/fourello/icare/SyncParentDataActivity.java