Merge pull request #257 from LearningLocker/master

Fix
Tweak to activity repo
tweaks
Convert timestamp
Sort out spacing
Remove trace from app missing
Improve migration
Merge pull request #259 from LearningLocker/develop

Convert timestamp