commit
Merge branch 'master' of https://github.com/arturro2828/Fakturator13.33

Conflicts:
	test.db-journal