Added Combined Arms tech with Tank, Anti-Tank Gun units and Pentagon wonder

Tech tree rearrangement - now much closer to original G&K tree

android/assets/jsons/Buildings.json

@@ -623,15 +623,15 @@
 		providesFreeBuilding:"Broadcast Tower"
 		uniques:["+1 population in each city","+1 happiness in each city"]
 		requiredTech:"Telecommunications" // todo doesn't exist yet!
-	},
+	},*/
 	{
 		name:"Pentagon",
 		isWonder:true,
 		culture:1,
 		greatPersonPoints:{production:2}
 		uniques:["Gold cost of upgrading military units reduced by 33%"]
-		requiredTech:"Combined Arms" // todo doesn't exist yet!
+		requiredTech:"Combined Arms"
-	},*/
+	},
 	{
 		name:"Spaceship Factory",
 		production:3,

android/assets/jsons/Techs.json

@@ -424,12 +424,22 @@
 				row:2,
 				prerequisites:["Plastics","Refrigeration"]
 			},
+			{
+				name:"Atomic Theory",
+				row:3,
+				prerequisites:["Plastics","Electronics"]
+			},
 			{
 				name:"Computers",
 				row:5,
 				prerequisites:["Electronics"],
 				uniques:["+10% science and production in all cities"]
 			},
+			{
+				name:"Combined Arms",
+				row:7,
+				prerequisites:["Ballistics","Combustion"]
+			},
 		]	
 	},
 	{
@@ -442,7 +452,12 @@
 			{
 				name:"Ecology",
 				row:2,
-				prerequisites:["Pharmaceuticals"]
+				prerequisites:["Atomic Theory","Pharmaceuticals"]
+			},
+			{
+				name:"Nuclear Fission",
+				row:3,
+				prerequisites:["Atomic Theory"]
 			},
 			{
 				name:"Robotics",
@@ -452,12 +467,7 @@
 			{
 				name:"Rocketry",
 				row:6,
-				prerequisites:["Ballistics","Computers"]
+				prerequisites:["Combined Arms","Computers"]
-			},
-			{
-				name:"Nuclear Fission",
-				row:7,
-				prerequisites:["Combustion"]
 			}
 		]
 	},
@@ -474,14 +484,14 @@
 				prerequisites:["Robotics","Ecology"]
 			}
 			{
-				name:"Satellites",
+				name:"Particle Physics",
-				row:5,
+				row:4,
-				prerequisites:["Rocketry","Computers","Ecology"]
+				prerequisites:["Nuclear Fission"]
 			}
 			{
-				name:"Particle Physics",
+				name:"Satellites",
-				row:6,
+				row:5,
-				prerequisites:["Ecology","Computers","Nuclear Fission"]
+				prerequisites:["Rocketry","Robotics"]
 			}
 		]	
 	},
@@ -494,7 +504,7 @@
 		techs:[
 			{
 				name:"Future Tech",
-				row:5,
+				row:4,
 				prerequisites:["Nanotechnology","Particle Physics","Satellites"],
 				uniques:["Who knows what the future holds?"]
 			}

android/assets/jsons/TileResources.json

@@ -115,7 +115,7 @@
 	{
 		name:"Uranium",
 		resourceType:"Strategic",
-		revealedBy:"Nuclear Fission",
+		revealedBy:"Atomic Theory",
 		terrainsCanBeFoundOn:["Plains","Desert","Tundra","Hill","Snow","Forest","Desert","Marsh","Grassland"],
 		production:1,
 		improvement:"Mine",