merge
Merge branch 'master' of https://github.com/amoljmane/AirlineManagementClient
- merge Code and update the latest client side code

Conflicts:
	src/sjsu/cmpe273/project/service/AirlineManagementServiceSoapBindingStub.java