Added in lobby saving, fixed locations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/gsmg/plugin/gsmg_base/gsmg_base_main.java