minor
merge
Merge branch 'master' of https://github.com/pitex/e-parafia

Conflicts:
	src/main/java/ui/panels/edit/FinanseModificationPanel.java