Interface SettingsWindow was debugged
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/github/dreamrec/Controller.java
	src/com/github/dreamrec/edf/EdfWriter.java
Interface SettingsWindow was debugged