Merge origin/java into dev

Conflicts:
	nbproject/project.properties
	src/smtpserver/DataBase.java
	src/smtpserver/SmtpSession.java
Linux daemon SMTP Server
Merge pull request #8 from Bashkinator/smtp-server-daemon-linux-dev

Smtp server daemon linux dev merge to master