Trip entity; added persistence.xml file
Merge origin/master