switching to lodash
Merge branch 'feature/Lodash_conversion' into develop