Test changes added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	railwayproject/src/main/java/com/tsystems/Domain/Entities/PassengerEntity.java
	railwayproject/src/main/java/com/tsystems/Domain/Entities/SheduleEntity.java
	railwayproject/src/main/java/com/tsystems/Domain/Entities/StationEntity.java
	railwayproject/src/main/java/com/tsystems/Domain/Entities/TicketEntity.java
	railwayproject/src/main/java/com/tsystems/Domain/Entities/TrainEntity.java
	railwayproject/src/main/java/com/tsystems/Domain/Entity/Passenger.java
	railwayproject/src/main/java/com/tsystems/Domain/Entity/Shedule.java
	railwayproject/src/main/java/com/tsystems/Domain/Entity/Station.java
	railwayproject/src/main/java/com/tsystems/Domain/Entity/Ticket.java
	railwayproject/src/main/java/com/tsystems/Domain/Entity/Train.java
	railwayproject/src/main/java/com/tsystems/Main.java
	railwayproject/src/main/java/com/tsystems/Protocol/AsynchronousTcpClient.java
	railwayproject/src/main/java/com/tsystems/Protocol/AsynchronousTcpServer.java
	railwayproject/src/main/java/com/tsystems/Protocol/BlockingTCPClient.java
	railwayproject/src/main/java/com/tsystems/Protocol/BlockingTCPServer.java
	railwayproject/src/main/java/com/tsystems/Protocol/ChangeRequest.java
	railwayproject/src/main/java/com/tsystems/Protocol/Client.java
	railwayproject/src/main/java/com/tsystems/Protocol/MyClientImpl.java
	railwayproject/src/main/java/com/tsystems/Protocol/NonBlockingTcpClient.java
	railwayproject/src/main/java/com/tsystems/Protocol/NonBlockingTcpServer.java
	railwayproject/src/main/java/com/tsystems/Protocol/Server.java
	railwayproject/src/main/java/com/tsystems/Protocol/ServerEvent.java
	railwayproject/src/main/java/com/tsystems/Protocol/Worker.java
	railwayproject/src/main/java/com/tsystems/client/MyClientImpl.java
	railwayproject/src/main/java/com/tsystems/client/others/AsynchronousTcpClient.java
	railwayproject/src/main/java/com/tsystems/client/others/BlockingTCPClient.java
	railwayproject/src/main/java/com/tsystems/client/others/Client.java
	railwayproject/src/main/java/com/tsystems/client/others/NonBlockingTcpClient.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entities/PassengerEntity.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entities/SheduleEntity.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entities/StationEntity.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entities/TicketEntity.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entities/TrainEntity.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entity/Passenger.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entity/Shedule.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entity/Station.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entity/Ticket.java
	railwayproject/src/main/java/com/tsystems/server/DAO/Entity/Train.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entities/PassengerEntity.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entities/SheduleEntity.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entities/StationEntity.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entities/TicketEntity.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entities/TrainEntity.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entity/Passenger.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entity/Shedule.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entity/Station.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entity/Ticket.java
	railwayproject/src/main/java/com/tsystems/server/Domain/Entity/Train.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/AsynchronousTcpClient.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/AsynchronousTcpServer.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/BlockingTCPClient.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/BlockingTCPServer.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/ChangeRequest.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/Client.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/MyClientImpl.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/NonBlockingTcpClient.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/NonBlockingTcpServer.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/Server.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/ServerEvent.java
	railwayproject/src/main/java/com/tsystems/server/Protocol/Worker.java
	railwayproject/src/main/java/com/tsystems/server/others/AsynchronousTcpServer.java
	railwayproject/src/main/java/com/tsystems/server/others/BlockingTCPServer.java
	railwayproject/src/main/java/com/tsystems/server/others/ChangeRequest.java
	railwayproject/src/main/java/com/tsystems/server/others/NonBlockingTcpServer.java
	railwayproject/src/main/java/com/tsystems/server/others/Server.java
	railwayproject/src/main/java/com/tsystems/server/others/ServerEvent.java
	railwayproject/src/main/java/com/tsystems/server/others/Worker.java