Merge origin/master

Conflicts:
	src/vits/project/WriteNewAdvancePayment.java