Merge persistence

Merge persistence code to Android and fix spelling of 'caculate'