merged
Merge branch 'master' of https://github.com/ivangoblin/homelord

Conflicts:
	homelord/finances/models.py