these files have arisen after code generation and java->c#
Merge branch 'development' of github.com:kewgen/aow into development

Conflicts:
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuSetSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuSetSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuildingRallyPointSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuildingRallyPointSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuildingUpgradeSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuildingUpgradeSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuyUnitSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommBuyUnitSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommUnitBombersTargetingSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommUnitBombersTargetingSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommUnitsMoveSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommUnitsMoveSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommUnitsSiegeSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AICommUnitsSiegeSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AirportSlotSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/AirportSlotSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/CoordinateSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/CoordinateSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/EmptyTargetSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/EmptyTargetSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/EntryPointSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/EntryPointSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightMapSTDeserializer.cs
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightMapSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightMapSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightSegmentAccelerateSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightSegmentAccelerateSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightSegmentRotateSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightSegmentRotateSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightSegmentSimpleSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/FlightSegmentSimpleSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/GoToBattleNotificationSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/GoToBattleNotificationSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/LoginToBattleAnswerSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/LoginToBattleAnswerSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/LoginToBattleRequestSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/LoginToBattleRequestSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/MessageBuildingRallyPointSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/MessageBuildingRallyPointSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/NewBattleSideConnectedNotificationSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/NewBattleSideConnectedNotificationSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/NoBattleServiceAvailableNotificationSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/NoBattleServiceAvailableNotificationSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/PatrolRouteSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/PatrolRouteSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/PlayerIdentifierSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/PlayerIdentifierSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/StartBattleCancellationNotificationSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/StartBattleCancellationNotificationSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/StartBattleNotificationSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/StartBattleNotificationSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/WeaponSTDeserializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/gen.src/com/geargames/serialization/serializers/WeaponSTSerializer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/BulletEngineType.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/EmptyTarget.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/PatrolRoute.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/UnitStateSpecType.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/battle/EntryPoint.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/BattleConfirmation.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/BattleMessage.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/GoToBattleNotification.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/LoginToBattleAnswer.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/LoginToBattleRequest.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/MainConfirmation.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/MainMessage.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/NewBattleSideConnectedNotification.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/NoBattleServiceAvailableNotification.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/PlayerIdentifier.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/StartBattleCancellationNotification.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/StartBattleNotification.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/commands.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/commands/CommandMessage.cs.meta
	client/Assets/AOW Assets/Scripts/Converted/src/com/geargames/aow/entities/messages/commands/MessageBuildingRallyPoint.cs.meta