Update Files from Master
Merge remote-tracking branch 'origin/Test'

Conflicts:
	GamePortal_PHP_JS/WebContent/portal 3/games/WordExplorer/index.html
	GamePortal_PHP_JS/WebContent/portal
3/games/WordExplorer/lang/US/en/te/country.js
	GamePortal_PHP_JS/WebContent/portal
3/games/WordExplorer/lang/US/en/te/family.js
	GamePortal_PHP_JS/WebContent/portal 3/games/WordExplorer/script/Main.js
	GamePortal_PHP_JS/WebContent/portal 3/games/WordExplorer/testgui.html
Updating Main with TEST modifications
Merge remote-tracking branch 'origin/master' into Test