update base64 handling in cmcrypt and localstorage
Merge branch 'origin/feature-story-468'