Added Json testing
Json commentsMerge branch 'master' of https://github.com/JacoDieWizard/EPE

Conflicts:
	gameMaster.pro.user