Merge commit 'd10e1073ce1507adb25e189826347abae504c125' into emblem

Conflicts:
	libnemo-private/nemo-bookmark.c
	src/nemo-places-sidebar.c
	src/nemo-window-manage-views.c
	src/nemo-window.c
Merge commit 'f96357dcec0d4a7a90ce10d249ef164d9b093434' into emblem

Conflicts:
	libnemo-private/nemo-global-preferences.c
	src/nemo-places-sidebar.c