Merge branch 'Test'

Conflicts:
	GamePortal_PHP_JS/WebContent/portal
3/games/alphaarranger/script/Slider2Objects.js
	GamePortal_PHP_JS/WebContent/portal
3/games/alphaarranger/script/global.js
	GamePortal_PHP_JS/WebContent/portal
3/games/wordexplorer/lang/CurrentLangDirs.js
	GamePortal_PHP_JS/WebContent/portal
3/games/wordexplorer/script/global.js
Checking in
Merge remote-tracking branch 'origin/master'