Separated out merging and displaying game lists into different methods.
Merge branch 'master' into gui

Conflicts:
	src/gamesincommon/GamesInCommon.java