Updated to Telugu to English
Updated to sound
Update for game and portal settings
Update to 4P1W game index.html
Adding Admin portal + updates to 4P1W game files
Updated index.php code
Merge branch 'Test' of https://github.com/teknophile74/ICS_499_Group2
into Test

Conflicts:
	GamePortal_PHP_JS/WebContent/portal 3/games/fourpicsoneword/Index.html
Update for extra Div tag
Adding base admin portal
adding 4 Pics 1 word html
Updated Game to handle alternate in game changes for style. Updated
settings for game play and appearence
Updating with proper SQL DB name and new user name
Changes for portal admin and slider
new admin script to drive upload page
Updating GamePortal Admin site with needed controller info and needed
settings
Added [origin] country to upload page
Updating upload files and conversion settings for admin page
Update to login and php pages
Conversion Process Updates
Project Level files
Merge branch 'Test'

Conflicts:
	GamePortal_PHP_JS/WebContent/portal
3/games/alphaarranger/css/slider2.css
	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
	GamePortal_PHP_JS/WebContent/portal 3/index.php