#4 fixed problem with _.merge

Merged
herby merged 1 commits from psvensson/master into herby/master 4 år sedan

1 Incheckningar

Upphovsman SHA1 Meddelande Datum
  Peter Svensson fbbfa2be9f changed lodash merge to mergeWith to solve breaking changes when upgrading 4 år sedan