changed ivy settings to include lock strategy for cache
Merge branch 'master' of github.com:webdetails/cda