- finished search flights function
-My DB update
Merge branch 'master' of https://github.com/shibai/cmpe273

Conflicts:
	AirlineManagementService/src/sjsu/cmpe273/project/dao/AirlineEmployeeDao.java
	AirlineManagementService/src/sjsu/cmpe273/project/dao/CustomerDao.java
	AirlineManagementService/src/sjsu/cmpe273/project/dao/PersonDao.java
	AirlineManagementService/src/sjsu/cmpe273/project/process/EmployeeProcess.java
	AirlineManagementService/src/sjsu/cmpe273/project/service/AirlineManagementService.java
get update
Merge branch 'master' of https://github.com/shibai/cmpe273

Conflicts:
	AirlineManagementService/src/sjsu/cmpe273/project/dao/AirlineEmployeeDao.java
	AirlineManagementService/src/sjsu/cmpe273/project/dao/CustomerDao.java
	AirlineManagementService/src/sjsu/cmpe273/project/dao/PersonDao.java
	AirlineManagementService/src/sjsu/cmpe273/project/helper/ConnectJDBC.java
	AirlineManagementService/src/sjsu/cmpe273/project/process/CustomerProcess.java
	AirlineManagementService/src/sjsu/cmpe273/project/process/EmployeeProcess.java
	AirlineManagementService/src/sjsu/cmpe273/project/service/AirlineManagementService.java