Merge origin/java into dev

Conflicts:
	nbproject/project.properties
	src/smtpserver/DataBase.java
	src/smtpserver/SmtpSession.java