Qpx bug destroyed

Bugs in QPX parser fixed
Merge branch 'master' of https://github.com/khaled87/Travel_Buddy

Conflicts:
	travel_buddy/src/main/java/travelbuddy/entity/Trip.java
	travel_buddy/src/main/java/travelbuddy/proxy/IQPXProxy.java
	travel_buddy/src/main/java/travelbuddy/proxy/QPXProxy.java
	travel_buddy/src/main/resources/META-INF/persistence.xml