Merge branch 'master' into androidui
code formatting
fix compilation with TLS
allow SASL PLAIN over secure connection
Merge branch 'androidui' of github.com:BombusMod/BombusMod into androidui
Merge branch 'master' into androidui