Merge

XMPP resource is now named "LOQUI-FirefoxOS" or "LOQUI-PC" depending on the device. Really nice :)