assiso
Merge branch 'master' of https://github.com/lao605/zkloan

Conflicts:
	.idea/workspace.xml
	P2P/settings.pyc
	P2P/urls.py
	P2P/urls.pyc
	zkloan/DAO/CompanyDAO.pyc
	zkloan/DAO/IndividualDAO.pyc
	zkloan/DAO/ProjectDAO.pyc
	zkloan/ListViewDAOs/FundFlowListViewDAO.pyc
	zkloan/ListViewDAOs/PaymentListViewDAO.pyc
	zkloan/ListViewModels/FundFlowListView.pyc
	zkloan/ListViewModels/PaymentListView.pyc
	zkloan/ListViewModels/RepaymentListView.pyc
	zkloan/ListViewServices/FundFlowListViewService.pyc
	zkloan/ListViewServices/RepaymentListViewService.pyc
	zkloan/Service/ProjectService.pyc
	zkloan/mangerviews.pyc
	zkloan/models.pyc
	zkloan/views.pyc