GUIview update
Merge origin/master

Conflicts:
	src/calogerusdraconis/GUIView.java