develop code in master

[Neustradamus]

Dear @redsolution team,

It is possible to merge develop into master?

Thanks in advance.

[Neustradamus]

Same request for:

• https://github.com/redsolution/xabber-server