Move lodash to lib folder
Merge remote-tracking branch 'origin/master'