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

Conflicts:
	.idea/workspace.xml
	P2P/__init__.pyc
	P2P/settings.pyc
	P2P/urls.py
	P2P/urls.pyc
	P2P/wsgi.pyc