Added diff-highlight
Merge branch 'dev'