commit from office
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/float2net/mail_helper/App.java