Fix bamboo build failure
Fix bamboo build failure from s2s fixes merge
Jitsi Videobridge: Added bandwith control
Merge pull request #48 from Redor/master

MUC Service Plugin. I adding this to complement the User Service plugin.
Quick fix for old-skool Jabber on S2S
Merge pull request #49 from dwd/dwd/jabber-s2s-quickfix

Quick fix for old-skool Jabber on S2S
Update registration-props-form.jsp

missing close tag ">"
Merge pull request #50 from wolfposd/patch-1

Update registration-props-form.jsp
Update user-lockout.jsp

typo prevents custom minute setting
Merge pull request #51 from wolfposd/patch-2

Update user-lockout.jsp
Merge pull request #1 from igniterealtime/master

Merge from origin