persistence
Merge branch 'master' of
ssh://git@github.com/Mohadipe-Group/ThatsMyKidApps.git

Conflicts:
	ThatsMyKid/assets/www/js/persistence.js