Merge nautilus commit '581a1df69a19d7ac7236202ca2a1839e667bce88' into master_merge

Conflicts:
	src/nemo-application.c
	src/nemo-desktop-window.c
	src/nemo-desktop-window.h
	src/nemo-window.c
	src/nemo-window.h
Reverted app menu introducion.
Merge nautilus commit '8648e5da0f1a4e375dd985650558fe2ab2dc491b' into master_merge

Conflicts:
	src/nemo-actions.h
	src/nemo-application.c
	src/nemo-application.h
	src/nemo-window-menus.c
	src/nemo-window.h
	src/nemo.gresource.xml
Merge nautilus commit 'd5a9299fc58e646bfbdb8ede8eabb0b9e786eb5e' into master_merge

Conflicts:
	libnemo-private/Makefile.am
	libnemo-private/nemo-entry.c
	libnemo-private/nemo-undo-manager.c
	libnemo-private/nemo-undo-manager.h
	libnemo-private/nemo-undo-signal-handlers.c
	libnemo-private/nemo-undo-signal-handlers.h
	libnemo-private/nemo-undo-transaction.c
	libnemo-private/nemo-undo-transaction.h
	libnemo-private/nemo-undo.c
	libnemo-private/nemo-undo.h
	src/nemo-application.c
	src/nemo-application.h
	src/nemo-bookmarks-window.c
	src/nemo-properties-window.c
	src/nemo-window-bookmarks.c
	src/nemo-window-menus.c
	src/nemo-window.c
Merge nautilus commit 'b6bd80c3ab94e647359ef536dd694794390b1a5e' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-clipboard.c
	libnemo-private/nemo-clipboard.h
	libnemo-private/nemo-entry.c
	libnemo-private/nemo-entry.h
	src/nemo-application.c
	src/nemo-bookmark-list.c
	src/nemo-bookmark-list.h
	src/nemo-bookmarks-window.c
	src/nemo-bookmarks-window.h
	src/nemo-window-bookmarks.c
	src/nemo-window-bookmarks.h
Merge commit '6fb160ab902737c7301ad89d20cbcc16f4c355a2' into nemo_master_merge

Conflicts:
	po/POTFILES.in
	po/es.po
	src/nemo-actions.h
	src/nemo-application.c
	src/nemo-application.h
	src/nemo-connect-server-dialog-nonmain.c
	src/nemo-location-bar.c
	src/nemo-main.c
	src/nemo-places-sidebar.c
	src/nemo-progress-ui-handler.c
	src/nemo-window-manage-views.c
	src/nemo-window-menus.c
Reverted accel remove and script dir change.
Merge commit '05e7b7cc4d70b0c89442241e1a741d63a6c5d24d' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-file-utilities.c
	po/he.po
	src/nemo-application.c
	src/nemo-view.c
Fixed https://bugzilla.gnome.org/show_bug.cgi?id=619529
Merge commit '8d3289d3f5386fac9fb2aded7dd67fd0a9252dd8' into nemo_master_merge

Conflicts:
	src/nemo-window.c
Merge commit 'e76c79022d4cd8d72d7bc972f5458a87f1695d82' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-file-utilities.c
	libnemo-private/nemo-file-utilities.h
	src/nemo-view.c
Merge commit '5ab3050f22da718264a35e61ada4be1a386a6e2d' into nemo_master_merge

Conflicts:
	libnautilus-private/nautilus.convert
	libnemo-private/nemo-desktop-directory.c
	libnemo-private/nemo-file-operations.c
	libnemo-private/nemo-file-utilities.c
	libnemo-private/nemo-file-utilities.h
	libnemo-private/nemo-global-preferences.h
	libnemo-private/org.nemo.gschema.xml.in
	src/nemo-desktop-icon-view.c
	src/nemo-desktop-window.c
	src/nemo-pathbar.c
	src/nemo-places-sidebar.c
	src/nemo-view.c
Merge commit 'c039b03590c86f5142c78d616700ef7af7c8a5a8' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-icon-container.c
	po/es.po
	po/gl.po
	po/he.po
	src/nemo-pathbar.c
	src/nemo-places-sidebar.c
	src/nemo-properties-window.c
	src/nemo-query-editor.c
	src/nemo-window.c
Merge commit 'aabb468c1ff6a48734f5f3d1be3a606a3cee9a8d' into nemo_master_merge

Conflicts:
	libnemo-private/nemo-icon-canvas-item.c
	src/nemo-pathbar.c
	src/nemo-pathbar.h
Revert pathbar: remove fake root atributes
Merge commit '6432c95e610ba67a56a4c664b002105fe0cc2186' into nemo_master_merge

Conflicts:
	src/nemo-pathbar.c
	src/nemo-pathbar.h