MatchingGameFrame additions
MatchingGameFrame additions
Merge origin/master

Conflicts:
	AMedievalHarvestFestival/nbproject/project.properties