merge from master
merge related encrytion update
update cache for encrypt
Remove activity_token.xml file
merge from master
integrate latest crypto helper
handle thread safety for crypto helper instance
update test for version check
Merge pull request #29 from MSOpenTech/prefencrypt

Integrate crypto helper to persistent cache
get latest from master