query-editor: use real toolbars instead of drawing the background

This way, we don't need to go through hoops to render background and
frame, or hacks to get a spacing around the box, since the theme sets a
padding on it.
query-editor: avoid an additional vbox

Since we're a vbox already, and this vertical box is our only child.
preferences: fix icon view -> canvas view leftover

This was lost in the massive renaming.
application: add an environment variable to debug no-app-menu scenarios

So that we can test under a stock environment the behavior when an app
menu is not provided by the shell (since we have fallback code for such
a case).

https://bugzilla.gnome.org/show_bug.cgi?id=681394
menus: make sure to show About and Help when no app menu is displayed

We had code for this, but it broke when we moved to a gear menu.

https://bugzilla.gnome.org/show_bug.cgi?id=681394
Fix other breakage from IconView->CanvasView renames

- fix loading of the desktop icon view
- don't use the term "Canvas" in translatable strings, since that's just
  an internal implementation detail

This also fixes
https://bugzilla.gnome.org/show_bug.cgi?id=681388
Updated Spanish translation
Updated Spanish translation
Improve error handling of directory loading
Make sure error dialog has a parent
Select first item in search results by default
release: prepare for 3.5.5
Fixed wrong ui resource path
query_editor: Reintroduced GTK_STOCK_REMOVE icon
Merge commit '1d3cdd00807f527296fd337646780edd3980ed9f' into nemo_master_merge

Conflicts:
	src/nemo-query-editor.c
Merge commit 'e5f2d96517352d641917c9130171ee488557a21d' into nemo_master_merge
Merge commit '5ccf6967c1acc0d4e99a4656d0458aaa5993856b' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-global-preferences.c
	libnemo-private/nemo-global-preferences.h
Revert: "application: add an environment variable to debug no-app-menu scenarios"

Merge commit 'dbbeefd6ed126e55595e76e926b463d206489ebf' into nemo_master_merge

Conflicts:
	src/nemo-application.c
	src/nemo-shell-ui.xml
Merge commit 'bdb1147bf1ef04f5d45c7c378674d60ac89a86ee' into nemo_master_merge

Conflicts:
	po/POTFILES.in
	src/Makefile.am
	src/nautilus-canvas-view-ui.xml
	src/nautilus-directory-view-ui.xml
	src/nemo-application.h
	src/nemo-canvas-view.c
	src/nemo.gresource.xml
Merge commit 'fbc739e05e759b292a8dcaa8bc675ceda7b573f9' into nemo_master_merge

Conflicts:
	po/es.po
	src/nemo-connect-server-dialog-nonmain.c
	src/nemo-window-manage-views.c
	src/nemo-window-slot.c
	src/nemo-window-types.h