Fixed errors with JFX jar build path
changes to mainmenu and shop
Merge branch 'master' into darren

Conflicts:
	src/GUI/MainMenuGUI.java