Merge remote-tracking branch 'origin/aiya000'

Conflicts:
	labomailer.db
	prefs.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/blacky(TopView)'

Conflicts:
	bin/transceiver/.gitignore
	bin/transceiver/MailObject.class
	bin/transceiver/Status.class
	prefs.xml
	src/transceiver/MailObject.java