bugfixes
Merge branch 'development' of
https://github.com/if12b088/TWMailerServer.git into development

Conflicts:
	src/TWMailerServer.cpp