* Merge from Debian unstable (LP: #316986). Remaining Ubuntu changes: - Changes to debain/control to substitute iceweasel by firefox - Changes in debian/rules to take into account new binary name - Creation of debian/link, debian/docs and debian/install