refs #654
Merge branch 'master' of git@github.com:RonBe/loan.git

Conflicts:
	__init__.py