Timestamp API fix in Android, pushed CRP with login fix to store
Merge pull request #917 from stowellm/goat

Timestamp API fix in Android, pushed CRP with login fix to store