Fixed endless loop when setting file encodings and fixed changing of line separators (got rid of concurrent write modification exception and used separator replacement function supported by non-IntelliJ editors
Ignore .DS_STORE
Merge remote-tracking branch 'origin/master'