working on ticket-flight-test still getting some errors related to the creation of a transaction
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/flight.php