Merge remote-tracking branch 'origin/bugfix/7343-static-uids' into testing
Merge branch 'testing' into devel
Merge remote-tracking branch 'origin/bugfix/7329-unsafe-browser-with-win8-camouflage' into feature/6342-update-camouflage-for-gnome3
Merge remote-tracking branch 'origin/testing' into feature/6342-update-camouflage-for-gnome3

Conflicts:
	wiki/src/contribute/release_process/test.mdwn
Drop obsolete design doc bullet about setting the search engine to Wikipedia.
Merge remote-tracking branch 'origin/bugfix/7329-unsafe-browser-with-win8-camouflage' into feature/6342-update-camouflage-for-gnome3
Actually run "Upgrade from ISO" from a USB drive running the old version.

That's what users do, and is buggy. If one already has an up-to-date Tails USB
stick, they can "Clone and upgrade", and won't bother using an ISO image.

Still, let's keep the "Clone from ISO while running the new version" test,
as it tests the Installer in the tested (new) version of Tails, which makes
little sense wrt. what users will do when the new version is out, but may catch
bugs that will affect upgrades to N+1.
adding may report
Include the syslinux binary, and its MBR, in the ISO filesystem.

This in turn allows Tails Installer to use this binary and MBR, which is
critical for avoiding problems (such as #7345) on "Upgrade from ISO".
adding a press occurence
Create empty blueprint so that Jake can edit it.
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
Translate Tails 1.0.1 news and security holes to pt-br.
Update first steps translation to pt-br.
paxtest results
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
Merge remote-tracking branch 'mercedes508/master'
Moved to awards section.
updated PO files
Revert "Call the user part of the script early"

This reverts commit 995f0d7898a107aeaa6fd509ba065122104783f0, which breaks camouflage mode.