Uses default settings in Settings class (TODO: read from file and test)

Conflicts:

	src/MainTypePanel.java
	src/MainWindow.java
	src/Settings.java
	src/User.java
Removed .orig files after fix