first
second
Merge branch 'master' of https://github.com/fangjh/BillingSystem

Conflicts:
	BillingSystem/DAL/BorrowDAL.cs
	BillingSystem/DAL/LoanDAL.cs
	BillingSystem/Models/BorrowORLoanInfo.cs
	BillingSystem/Scripts/Loan-Jquery.js
	BillingSystem/Views/Ajax.aspx.cs
	BillingSystem/Views/Borrowing/Loan.aspx
	BillingSystem/Views/Borrowing/Loan.aspx.cs
tijiao