Update GUI.
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaJJR/src/gui/reg/RegWindow.java