Merge remote-tracking branch 'origin/master'

Conflicts:
	project/database.sqlite
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/cashflow/models.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/cashflow/models.py