Merge remote-tracking branch 'org/testing'
Merge remote-tracking branch 'org/uiUpdate'
Merge remote-tracking branch 'org/uiUpdate'
opened firewall to let xmpp traffic through
Merge remote-tracking branch 'org/testing'
Merge branch 'master' into open-firewall-for-xmpp
Merge pull request #332 from shatterednirvana/open-firewall-for-xmpp

Open firewall for XMPP