Use lodash instead of underscore
Merge branch 'develop'