Added Code for communicating with QPX(Flight api)
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel_buddy/src/main/java/travelbuddy/proxy/QPXProxy.java