updated Master Gui
update

update
Merge branch 'master' of https://github.com/kendetta/HMS-Git

Conflicts:
	HMS/src/GUI_CAT/Master_GUI.java