Merge remote-tracking branch 'origin/dev'
Merge branch 'master' of github.com:fundon/atom-minimap