merge with master
merge with master

lasombra/kaiwa,digicoop/kaiwa,syci/kaiwa,di-stars/kaiwa,weiss/kaiwa,ForNeVeR/kaiwa,warcode/kaiwa,birkb/kaiwa,syci/kaiwa,rogervaas/otalk-im-client,weiss/kaiwa,digicoop/kaiwa,heyLu/kaiwa,ForNeVeR/kaiwa,syci/kaiwa,warcode/kaiwa,ForNeVeR/kaiwa,nsg/kaiwa,nsg/kaiwa,di-stars/kaiwa,digicoop/kaiwa,warcode/kaiwa,otalk/otalk-im-client,lasombra/kaiwa,unam3/kaiwa,ForNeVeR/kaiwa,heyLu/kaiwa,birkb/kaiwa,di-stars/kaiwa,otalk/otalk-im-client,rogervaas/otalk-im-client,weiss/kaiwa,nsg/kaiwa,birkb/kaiwa,lasombra/kaiwa,heyLu/kaiwa,unam3/kaiwa