2.1.18 beta

* Fix for "option for deactivate client-server encryption (usage of SSL)"
* Cosmetic changes