Merge origin/master

Conflicts:
	SimonSaysDB/log/log.ctrl
	SimonSaysDB/log/log1.dat
	SimonSaysDB/log/logmirror.ctrl
	SimonSaysDB/seg0/c20.dat
	SimonSaysDB/seg0/c230.dat
	SimonSaysDB/seg0/c31.dat
	SimonSaysDB/seg0/c41.dat
	SimonSaysDB/seg0/c51.dat
	SimonSaysDB/seg0/c60.dat
	SimonSaysDB/seg0/c71.dat
	SimonSaysDB/seg0/c81.dat
	SimonSaysDB/seg0/c90.dat
	SimonSaysDB/seg0/ca1.dat
	SimonSaysDB/seg0/cb1.dat
	derby.log
	nbproject/project.properties
Merge origin/master

Conflicts:
	SimonSaysDB/log/log.ctrl
	SimonSaysDB/log/log1.dat
	SimonSaysDB/log/logmirror.ctrl
	derby.log