#3 test
wq:Merge branch 'master' of github.com:RonBe/loan

Conflicts:
	admin_scripts/temp.py
#3 test1