Merge origin/master

Conflicts:
	derby.log
	src/simonsays/gui/SimonSaysGUI.java