Merge pull request #14 from teknophile74/master

Test Branch Creation - Initial
updated to main.js
Update Files from Master
Pushing new updates to test
Update Pages with Lang Drops
Update to Main and Index
Updated for Dynamic switching of Categories
Updates to remove unknown changes
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 branch 'Stage' of https://github.com/teknophile74/ICS_499_Group2.git into Stage