New
Merge remote-tracking branch 'origin/master'

Conflicts:
	TravelAgency/src/com/jpa/entities/Client.java
	TravelAgency/src/com/jpa/entities/Transport.java