stupid derby.log
Merge origin/master

Conflicts:
	derby.log
Resized settings dialogue
Merge origin/master

Conflicts:
	derby.log
Resized settings dialogue