vim and gvim icon added
Merge branch 'dev'