use win line separator
resolve merge conflict
Merge branch 'master' of https://github.com/e4c/EclipseCommander.git