Merge branch 'master' into invite-dialog-jitsi

Fixes NullPointerException in conference invite dialog (ongoing work on
fixing missing contacts in invite dialog).
Merge branch 'master' of https://github.com/jitsi/jitsi
Commit from translate.jitsi.org by user emcho.: 1458 of 1458 strings translated (0 fuzzy).
Merge branch 'master' of https://github.com/jitsi/jitsi
New files added from translate.jitsi.org based on templates
Commit from translate.jitsi.org by user ibauersachs.: 1458 of 1458 strings translated (0 fuzzy).
Commit from translate.jitsi.org by user emcho.: 1458 of 1458 strings translated (0 fuzzy).
Commit from translate.jitsi.org by user emcho.: 1458 of 1458 strings translated (0 fuzzy).
Merge branch 'master' of git://github.com/jitsi/jitsi